For ENG-5201, fix timeout and comment based on Ning's feedback