Merge remote-tracking branch 'origin/backport-fix-session' into scoodle2

1 job for scoodle2