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

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