Merge pull request #4858 from huanghongbo-hhb/fix/notification-recipient-errors