DE745

This pull request contains two cherry picks from the upstream stable/havana branch to address DE745.  Both have landed upstream, but both landed after the most recent stable release and are therefore not yet in the h.3 codebase we're pushing in this branch (hence, I've cherry picked them).  Their original commit messages have been left in tact, but I've added "Upstream-review" and "Partial-rally-defect" tags for tracking purposes.