Merge pull request #1705 from Azaezel/cubeColorCleanup