Merge "Add canonical id to header on action=info"