support upsert x=x+values(x) expressions
merge upsert19 to master