Merge "Update the comment/ attribution section."