Merge branch 'jk/colors-fix' into maint