Yesterday
merge from fix_window_roof_placement -> main