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

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