[RCTD-536] RCTD-536