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

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