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

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