Merge branch 'master' into detect-fix-unschedulable