[RCTD-518] RCTD-518