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

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