ENG-6390 final version