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

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