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

This reverts commit 4bb67b58d703410e9f7269afa5600aeeebdc0a56.
Rebase from 'upstream' @ version '1.9.15'
Trimmed the branch to only the image_geometry sub directory