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

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