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

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