Merge "Update a comment"