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

This reverts commit d7b353410be7c3bc09f345c3d5387622f8540766.
Rebase from 'upstream'
Trimmed the branch to only the geometry sub directory