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

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