Add comments, manually merge #3181.