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

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