ENG-4336: Various DR fix ups.

Each commit in this pull request is independent from the others. There is a paired pull request in pro.