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

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