[RCTD-529] RCTD-529