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

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