[RCTD-499] RCTD-499