Updates related to auto loading of controller