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

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