Merge "Fixed cp error in method name"