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

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