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

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