For ENG-4859 fixes based on Ning's feedback