Merge "Add a comment explaining a bug fix" into main