Merge "Color correction improvement (1/n)"