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

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