[RCTD-522] RCTD-522