Merge "Make AddAnnotation stricter in parsing JSON file"