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

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