Merge "add normal routing for numbers in GP and RE" into udc-dev