Merge "Pushkin notification service expect 'email' label"