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

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