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

This reverts commit 3b90c8e7e2d8d4300f7253cdbfe84cf39e6c690d.
Rebase from 'upstream'
Trimmed the branch to only the image_geometry sub directory