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

This reverts commit c6dcceb2ee0362baec0e30eff02fde4cbc359091.
Rebase from 'upstream' @ version '1.9.29'
Trimmed the branch to only the geometry sub directory