Merge "tombstoned: fixed tombstones failed issue"