[RCTD-566] RCTD-566