NXIO-202: Align changes also to the manager