Revert "Trimmed the branch to only the scheduler sub directory"

This reverts commit 587a59c0d9bd3b2a1ac75f00f5634659f2b177a8.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the scheduler sub directory