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

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