Merge "Color correction improvement (4/n)"