Merge "Pixel alignment of ImageVisuals" into devel/master