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

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