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

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