[RCTD-513] RCTD-513