[RCTD-533] RCTD-533