[RCTD-629] RCTD-629