[ted] Prepare #980 merge