ENG-5202 Dependencies fixup