carry over the session when we forward()

Fixes #940
Merge branch 'pr/944' into devel