[RCTD-540] RCTD-540