For ENG-5853, bug fix base on Ning's feedback and as well as comment tweak