PMO-2428: apply same wiring concept for retro as for prospective contracts