Don't fill rhs values for variable length columns, fix merging of mutation state
Merge remote branch 'upstream/master'