ENG-6671 addressing Ning's comments