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

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