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

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