[RCTD-638] RCTD-638