Rename variable in Closure.
Merge branch '4.0'