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

This reverts commit 9d1694637e0fea34d980fcfe282acc13cf228a31.
Rebase from 'upstream'
Trimmed the branch to only the scheduler sub directory