ENG-5140 addressed Ning's code review comments