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

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