Merge "Speculative fix for concurrency SessionManager issue" into main