Merge branch 'concurrent-cancellable'