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

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