Merge "Revert "Proxy notification improvments""