Sync HA patches from roxy