NXIO-320 Align on master