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

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