Merge pull request #7008 from dannil/material-color-variables