import an incredibly useful debugging tool from 2.3
enforce agent-ship_address in backend interface, #21327