[RCTD-639] RCTD-639