[RCTD-626] RCTD-626