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

This reverts commit 74be79fbb894a2c99fa352df444c0cb308715198.
Rebase from 'upstream' @ version '1.10.3'
Trimmed the branch to only the image_geometry sub directory