intermediate commit for axpy 2.0, to fix rma and orig nbc soon