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

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