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

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