Merge pull request #2487 from shunjou/material-changes