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

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