ref: refs/heads/jl-fix-session-detection
