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

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