Today
merge from fix_roof_stability