Merge "Move the annotation right before String" into main