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

This reverts commit 5fa1ae4a3ee1c587d15589bda6cac5b317664c79.
Rebase from 'upstream' @ version '1.10.1'
Trimmed the branch to only the image_geometry sub directory