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

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