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

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