Merge "11/ Clean up usage of exported interfaces from internal controllers" into sc-dev