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

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