[RCTD-564] RCTD-564