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

This reverts commit 568b96993dc85be53d40da14cb49d7c43041e5cd.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the default_cfg_fkie sub directory