Merge "Enable passive deletes on trunk deletion"