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

This reverts commit 9e1d3ce1c6e9dce64afe5cd4c601acf84399a1b9.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the 3rdparty/ff sub directory