[control] fix crash on exit when running standalone
Merge branch 'master' into final