WATERSMART-304

also have 277 quick fix included in there