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

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