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

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