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

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