[RCTD-614] RCTD-614