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

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