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

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