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

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