For ENG-4719, minor changes based on Ning's feedback