removed unnecessary variable copying
Merge branch 'master' into develop