Merge "Drivetrain HA clusters model fixes"