Merge "Color correction improvement (5/n)"