[NFDM-498]