Update to npo02 3.1