remove shared VariableExpression instances
Merge branch '3.x'