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

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