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

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