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

This reverts commit 1f7e3f380085dd44f9f3e894c36a243adbde65a1.
Rebase from 'upstream' @ version '1.10.5'
Trimmed the branch to only the image_geometry sub directory