[2.2.8] Final commit for a longer time. Replaced TypeIds with Material.