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

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