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

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