Today
merge from main -> fix_terrain_texture_alloc