Merge branch 're/color-default-reset'