Nulling data in mapblock
Merge remote-tracking branch 'upstream/master' into merge3