Ha backports

Backports of HA fixes from stoney