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

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