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

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