Merge "Add ownership for ConfigurationController"