NXCM-5424: Moved dep near to it's user