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

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