Set expiration dates when starting tasks (#1303)
Merge branch 'new-editor-primary' into new-editor-primary-1043