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

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