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

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