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

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