Merge "Propagate cancellations to session" into main