[RCTD-561] RCTD-561