[#43505537] Cherry-pick instance deletion changes