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

This reverts commit 722cf1bb35203203d9f23e5a5dd74bcdd7837d16.
Rebase from 'upstream'
Trimmed the branch to only the 3rdparty/ff sub directory