Merge "Optimization of 8bit block error for high bitdepth"