[RCTD-531] RCTD-531