Merge branch 'ph/color-test'