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

This reverts commit 81fd722826c42bbcfa6bcae9b96c8d117ada264a.
Rebase from 'upstream' @ version '1.9.40'
Trimmed the branch to only the core/mk sub directory