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

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