Merge "BUG-1120: improve notification queue"