[RCTD-524] RCTD-524