Fixed #3328 3D Columns and null values
Merge remote-tracking branch 'upstream/master'