[RCTD-642] RCTD-642