Merge branch 'js/t9902-send-email-completion-fix' into maint