[RCTD-637] RCTD-637