Merge pull request #9120 from JosJuice/controller-defaults Fix controller defaults being empty on fresh run
