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

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