ENG-6322 final commit