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

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