Use cookies to fix concurrency issues
Merge dev