enhance found_email data, fixes #7752
Merge branch 'dev' into test