Merge "Revert addition of material shape resources." into main