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

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