[RCTD-624] RCTD-624