Merge "Rewrite pushkin notification configuration"