Today
merge from main -> building_los_fix