Merge branch 'feature-ExecutionManager' into develop