Merge branch 'jc/format-color-auto'