Merge "Add ID to action=info table rows"