[#78504284] Bundle update and make sure only one email is sent for a grouping, even if the wats come in really fast.