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

This reverts commit b0b3e997cc91cbecfa1db559d62394883e96b47e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the 3rdparty/ffha sub directory