Merge pull request #5241 from Ansuel/materialnew