Merge "Minimal fix for ControlTest (attempt 2)"