Merge "Revert "Revert "Speculative fix for concurrency SessionManager i..."" into main