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

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