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

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