Maid 60 merge acknowledgement work in routing to next

reflects changes in routing ack branch