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

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