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

This reverts commit 770d92701710ef1d222200514b5d3229d2b733d4.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the 3rdparty/ffha sub directory