Merge branch 'ml/color-when'