Trying to make resonable batch packets for sending messages and creating notifications
Merge branch 'gh-1461' into staging