Merge "Remove a comment." into main