Merge "Enabling ClientControllerTest as hostside test" into main