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

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