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

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