[NFDM-545] NFDM-545