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

This reverts commit f7efe31214a9ce56f4160e816c5388f64b2d0194.
Rebase from 'upstream'
Trimmed the branch to only the geometry sub directory