Removed yielfIfContendedSafely
Merge branch 'feature-batch' into shusshu-master