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

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