Closed roberthbailey closed 4 months ago
Cherry-pick #599 and #618 to the release-1.1 branch.
/gcbrun
Cherry-pick #599 and #618 to the release-1.1 branch.