Merge "Revert "Minimal fix for ControlTest""