Merge "fix cp related error"