Merge changes from topic 'feature/sdc-controller'