Merge branch '6179-improve-session-security' into 'develop'

Resolve "Improve session security"

Closes #6179

See merge request !1488
1 job for 6210-periodically-force-jailkit-update in 16 seconds (queued for 5 seconds)