Improved robustness
Merge branch 'new-concurrency-squashed' into js-updates