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

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