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

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