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

This reverts commit 0e33aed850ceffd3e7fdaafb5624a617a3a0c37e.
Rebase from 'upstream'
Trimmed the branch to only the image_geometry sub directory