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

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