[RCTD-627] RCTD-627