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

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