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

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