ENG-6428: review changes. Still waiting for system test issue.