Use getMaterialFromBaseId where still needed
7 files changed