Merge remote-tracking branch 'origin/dynamicScheduler' into dynamicScheduler