ENG-4568: