fixes #7469 activity assignee email
fixes #7470 alter condition for creating parent mailing job
Merge branch 'dev' into test