Artifacts of NMSProvider #920