Merge branch 'master' into hs_staging
Merge branch 'master' into hs_staging
Merge branch 'master' into hs_staging
fix to not kill tasks when pausing