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

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