Merge "Proxy notification improvements"