Merge "Add tombstone_config_prop and move related prop"