Merge branch 'dev' into single-process-debug
adds single-process-debug mode
Merge branch 'single-process-debug' into dev