Merge "Add ImageVisualShaderFactory" into devel/master