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

This reverts commit 9f7f29a35f0e118168c820ed7d750e98bc8570e8.
Rebase from 'upstream' @ version '1.9.28'
Trimmed the branch to only the geometry sub directory