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

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