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

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