Merge "Bugfix: HA kill process recovery has a conflict" into stable/fraser