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

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