Allow state concurrency
Merge pull request #10841 from cachedout/#10812

Allow state concurrency