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

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