Merge "Fix svace issue for image-operator" into devel/master