This corresponds to !696 for Sim11 that is instead now targeting the Sim10 branch
Sim10
cc: @kreps, @jback, @tlatham