Merge "Use Block::setTimestamp to set the timestamp on a block"