Sweeping !23523 from 21.3 to master. Fixes in the NSW TP PRD converters

Fixes in the NSW TP PRD converters

See merge request !23523 (merged)

Merge request reports

Loading