[mtv] Prepare for #980