[RCTD-497] RCTD-497