ENG-4638: All fixes from the ENG-4638 branch that apply to 2.8.4.x.