Automatic merge from submit-queue (batch tested with PRs 45345, 49470, 49407, 49448, 49486) Fix ha-master tests