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

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