Merge branch 'hotfix/errorStatusWhenCommandWatcherCrash'
Fix missing import in commandwatcher
Merge branch 'hotfix/import_httperror' into develop