Merge "Allow configuration of the number of tombstones."