Merge branch '80-concurrent_issue' into ci-merge-test

6 jobs for ci-merge-test in 1837 minutes and 24 seconds (queued for 9 minutes and 4 seconds)