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

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