Cornsilk 13 9 acu109055 improve router retry

@dominicm @robertsulway @tony-spataro-rs