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

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