[RCTD-620] RCTD-620