NXDRIVE-157: WIP