ENG-5051:  This is the real merge commit.  I forgot to mark everything
for inclusion after resolving a conflict.  Hopefully this doesn't muck
up the merge back to master.