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

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