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

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