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

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