Start refactoring materials
More material work
Merge remote-tracking branch 'origin/master' into MaterialsRefactor
Merge remote-tracking branch 'origin/master' into MaterialsRefactor