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

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