Merge "Add Grant to the text owners" into main