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

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