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

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