Merge pull request #5331 from Ansuel/fixmaterial