ENG-5875-prep regression patch