Merging core color changes from master