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

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