Fixes error with work stream where it could blank out data on rapid clicks on the publish button.
Merge branch 'release/2.1' into release/2.2