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

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