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

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