Updated mappings as per Zendesk ticket #64671