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

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