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

This reverts commit ee6f2e05c6473484c5e2bb516c85b3a02a49b8ba.
Rebase from 'upstream'
Trimmed the branch to only the geometry_experimental sub directory