[RCTD-527] RCTD-527