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

This reverts commit b5b87ef7f24696fb40796dbbdd55386763e32cd6.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the default_cfg_fkie sub directory