Merge branch 'master' into scheduler_cleanup