[RCTD-525] RCTD-525