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

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