Merge commit
Towards getting the new material system to work