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

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