Bugfix for control start breakage
Merge remote-tracking branch 'origin/DEV'