Merge "Remove Atlas usage from ImageVisual" into devel/master