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

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