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

This reverts commit 35303812621b69617e944c4e40cc4a4b69f5eb3a.
Rebase from 'upstream' @ version '1.9.12'
Trimmed the branch to only the image_view sub directory