Merge branch 'refs/heads/dev'
Notice when no color options available resolved