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

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