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

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