Merge "Bugfix: fix HA testcases"