Revert "Trimmed the branch to only the geometry sub directory"

This reverts commit eeaf685b6f796ab6af2b204828c53744cb518ec7.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the geometry sub directory