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

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