Merge "modify bug for UT case"