[RCTD-538] RCTD-538