sharing a VariableExpression instance which refers to "this" is unsafe
Merge branch '2.3.x'