Cornsilk 13 12 acu119734 improve router

@dominicm @robertsulway