Prepare shell-* for 3.10 updates