Merge "Fix bug number in comment" into main