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

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