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

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