NMS-4951 if there are categories, send on add too, also put the event after the other event accumulator calls
Merge branch '1.12'