Removed unnecessary variable
Merge branch '4.0'