For ENG-5025, changes based on Ning's feedbkac