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

This reverts commit 6110fa6ea584175faa77ff2a5e09d6453188028e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the core/mk sub directory