Merge "Drivetrain HA model fixes"