Merge "HA - ARPHandler Event sync"