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

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