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

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