Revert "Trimmed the branch to only the core/mk sub directory"

This reverts commit 179b25210908fc33e983949b3d35d46f451b48b4.
Rebase from 'upstream'
Trimmed the branch to only the core/mk sub directory