Color flicker.
Merge branch 'release/11.0.4' into develop