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

This reverts commit 9f95478fe9bee052a493cae73d4b314635bef736.
Rebase from 'upstream' @ version '0.3.4'
Trimmed the branch to only the geometry_experimental sub directory