Fixed bug with work channel overflows
Merge branch 'master' into release-1.2.0