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

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