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

This reverts commit 3e59e407d083f1704a71eedde3f4cbe7d498e8f5.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the 3rdparty/ff sub directory