[NFDM-420]