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

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