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

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