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

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