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

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