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

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