[RCTD-541] RCTD-541