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

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