Sync with roxy wrt HA integration code