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

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