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

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