Merge "Introduce ConfigurationController" into sc-dev