Merge changes from topic 'bugfix/sdc-controller'