add mail notification with abort
Merge remote-tracking branch 'upstream/refractoring' into refractoring