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

This reverts commit 7c9729d46d38440e02deb86ae5e5cd9b05fa1935.
Rebase from 'upstream'
Trimmed the branch to only the geometry_experimental sub directory