Set the session on the incoming request so it's available.
Merge branch '4.1'