Merge "Prevent deleted count from being wrongly decremented"