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

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