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

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