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

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