Merge "Add @deprecated and @return error annotations" into main