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

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