[RCTD-554] RCTD-554