[RCTD-509] RCTD-509