optimize queued notifications
Merge branch 'develop'