Revert "Reacting to System.Collections.Concurrent versioning change"

This reverts commit d142dad157a131702b767094c2230ee92c1019b8.
Merge branch 'release' into dev
Revert "Revert "Reacting to System.Collections.Concurrent versioning change""

This reverts commit 4a210c13083765f13cf4f75f3680211533b6c0d2.