Merge pull request #14944 from colemanw/color