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

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