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

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