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

This reverts commit e98e075ecdf8b3128eff44489a1e0a6768b3f02c.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the 3rdparty/ff sub directory