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

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