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

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