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

This reverts commit 260dc58ddf7e52428b628d91e1dda823fa7bbb68.
Rebase from 'upstream' @ version '0.3.3'
Trimmed the branch to only the geometry_experimental sub directory