PRD-4747 - data-body uses non-standard naming