HA- Merge new changes from upstream grizzly/stable branch

Merging new changes to support HA