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

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