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

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