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

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