Add mappingNotification + Batching notification_listing Affinitic refs #5922