[RCTD-544] RCTD-544