[RCTD-514] RCTD-514