func name changed
Merge branch 'changeFunctionName' into dev