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

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