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

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