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

This reverts commit 2b47f084dc0ba6634de543299cbea1104bf8a22a.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the geometry_experimental sub directory