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

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