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

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