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

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