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

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