Merge "Changed MAX_PSNR to 100" into experimental