Merge "Color correction improvement (3/n)"