Merge "Clean up the controller reference after execution." into main