Merge "Explicitly release references to the controller" into main