Merge branch 'jk/ui-color-always-to-auto'