[RCTD-528] RCTD-528