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

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