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

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