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

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