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

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