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

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