ENG-4617 fix.
ENG-4617 fix.