Merge "Add intermediate variable for HA test"