Merge "upstream proxy release note"