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

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