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

This reverts commit f3ad0f2e540c42d4a00628a4924b0c96e5a7970e.
Rebase from 'upstream' @ version '1.10.2'
Trimmed the branch to only the image_geometry sub directory