[RCTD-630] RCTD-630