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

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