AMQNET-637 NMS 2.0