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

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