Merge "ImageVisualShaderFactory refactoring" into devel/master