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

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