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

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