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

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