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

This reverts commit 8540dce79f9633501a64545b90d27c5b69feca52.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the image_geometry sub directory