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

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