Revert "Trimmed the branch to only the 3rdparty/ffha sub directory"

This reverts commit 0291ea582354db0990993f3a280e305ea95e5e50.
Rebase from 'upstream'
Trimmed the branch to only the 3rdparty/ffha sub directory