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

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