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

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