Merge "Remove empty doc comment" into main