[RCTD-521] RCTD-521