Revert "Trimmed the branch to only the default_cfg_fkie sub directory"

This reverts commit 668037f887acac7025d016ff6ebd78c148482af1.
Rebase from 'upstream'
Trimmed the branch to only the default_cfg_fkie sub directory