diff --git a/docs/examples/QDevil/QDAC2/Scan.ipynb b/docs/examples/QDevil/QDAC2/Scan.ipynb
index 8e523cde4..f41e23bd5 100644
--- a/docs/examples/QDevil/QDAC2/Scan.ipynb
+++ b/docs/examples/QDevil/QDAC2/Scan.ipynb
@@ -265,7 +265,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Connect scope ch 1 to qdac output trigger 2\n",
+    "# Connect scope ch 1 to qdac output trigger 1\n",
     "scope.write('chan1:disp on')\n",
     "scope.write('chan1:bwl on')\n",
     "scope.write('chan1:prob 1')\n",
diff --git a/docs/examples/QDevil/QDAC2/do2dScan.ipynb b/docs/examples/QDevil/QDAC2/do2dScan.ipynb
index a7f0180be..dc67e3e9e 100644
--- a/docs/examples/QDevil/QDAC2/do2dScan.ipynb
+++ b/docs/examples/QDevil/QDAC2/do2dScan.ipynb
@@ -26,6 +26,7 @@
     "from time import sleep\n",
     "import numpy as np\n",
     "from qcodes.utils.dataset import doNd\n",
+    "from qcodes.dataset import load_or_create_experiment\n",
     "from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
     "qdac_addr = '192.168.8.17'\n",
     "qdac = QDAC2.QDac2('QDAC2', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')"
diff --git a/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py b/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py
index 7d4a3a36c..7dea161d7 100644
--- a/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py
+++ b/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py
@@ -10,7 +10,7 @@
 from packaging.version import parse
 import abc
 
-# Version 1.10.0
+# Version 2.0.0
 #
 # Guiding principles for this driver for QDevil QDAC-II
 # -----------------------------------------------------
@@ -46,6 +46,28 @@
 #
 
 
+# Context manager hierarchy
+# -------------------------
+#
+# _Channel_Context
+#   _Dc_Context
+#     Sweep_Context
+#     List_Context
+#   _Waveform_Context
+#     Square_Context
+#     Sine_Context
+#     Triangle_Context
+#     Awg_Context
+#   Measurement_Context
+# Virtual_Sweep_Context
+# Arrangement_Context
+# QDac2Trigger_Context
+#
+# Calling close() on any context manager will clean up any triggers or
+# markers that were set up by the context.  Use with-statements to
+# have this done automatically.
+
+
 pseudo_trigger_voltage = 5
 
 
@@ -112,6 +134,9 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         # Propagate exceptions
         return False
 
+    def close(self) -> None:
+        self.__exit__(None, None, None)
+
     @property
     def value(self) -> int:
         """internal SCPI trigger number"""
@@ -188,6 +213,10 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         # Propagate exceptions
         return False
 
+    @abc.abstractmethod
+    def close(self) -> None:
+        pass
+
     def allocate_trigger(self) -> QDac2Trigger_Context:
         """Allocate internal trigger
 
@@ -264,6 +293,9 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         # Propagate exceptions
         return False
 
+    def close(self) -> None:
+        self.__exit__(None, None, None)
+
     def start_on(self, trigger: QDac2Trigger_Context) -> None:
         """Attach internal trigger to DC generator
 
@@ -560,7 +592,13 @@ def __init__(self, channel: 'QDac2Channel'):
     def __enter__(self):
         return self
 
+    def _abort(self, wave_kind: str) -> None:
+        """Abort any running wave generator
+        """
+        self._write_channel(f'sour{"{0}"}:{wave_kind}:abor')
+
     def _cleanup(self, wave_kind: str) -> None:
+        self._abort(wave_kind)
         if self._trigger:
             self._channel._parent.free_trigger(self._trigger)
         if self._marker_start:
@@ -674,11 +712,13 @@ def __init__(self, channel: 'QDac2Channel', frequency_Hz: Optional[float],
         self._set_triggering()
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        self.abort()
         super()._cleanup('squ')
         # Propagate exceptions
         return False
 
+    def close(self) -> None:
+        super()._cleanup('squ')
+
     def start(self) -> None:
         """Start the square wave generator
         """
@@ -813,11 +853,13 @@ def __init__(self, channel: 'QDac2Channel', frequency_Hz: Optional[float],
         self._set_triggering()
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        self.abort()
         super()._cleanup('sine')
         # Propagate exceptions
         return False
 
+    def close(self) -> None:
+        super()._cleanup('sine')
+
     def start(self) -> None:
         """Start the sine wave generator
         """
@@ -945,11 +987,13 @@ def __init__(self, channel: 'QDac2Channel', frequency_Hz: Optional[float],
         self._set_triggering()
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        self.abort()
         super()._cleanup('tri')
         # Propagate exceptions
         return False
 
+    def close(self) -> None:
+        super()._cleanup('tri')
+
     def start(self) -> None:
         """Start the triangle wave generator
         """
@@ -1081,11 +1125,13 @@ def __init__(self, channel: 'QDac2Channel', trace_name: str,
         self._set_triggering()
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        self.abort()
         super()._cleanup('awg')
         # Propagate exceptions
         return False
 
+    def close(self) -> None:
+        super()._cleanup('awg')
+
     def start(self) -> None:
         """Start the AWG
         """
@@ -1193,6 +1239,21 @@ def __init__(self, channel: 'QDac2Channel', delay_s: float,
         self._write_channel(f'sens{"{0}"}:coun {repetitions}')
         self._set_triggering()
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.abort()
+        if self._trigger:
+            self._channel._parent.free_trigger(self._trigger)
+        # Always disable any triggering
+        self._write_channel(f'sens{"{0}"}:trig:sour imm')
+        # Propagate exceptions
+        return False
+
+    def close(self) -> None:
+        self.__exit__(None, None, None)
+
     def start(self) -> None:
         """Start a current measurement
         """
@@ -1326,7 +1387,7 @@ def __init__(self, parent: 'QDac2', name: str, channum: int):
         )
         self.add_parameter(
             name='measurement_delay_s',
-            label=f'delay',
+            label='delay',
             unit='s',
             set_cmd='sens{1}:del {0}'.format('{}', channum),
             get_cmd=f'sens{channum}:del?',
@@ -1410,7 +1471,7 @@ def __init__(self, parent: 'QDac2', name: str, channum: int):
         )
         self.add_parameter(
             name='output_filter',
-            label=f'low-pass cut-off',
+            label='low-pass cut-off',
             unit='Hz',
             set_cmd='sour{1}:filt {0}'.format('{}', channum),
             get_cmd=f'sour{channum}:filt?',
@@ -1467,7 +1528,7 @@ def __init__(self, parent: 'QDac2', name: str, channum: int):
         )
         self.add_parameter(
             name='dc_mode',
-            label=f'DC mode',
+            label='DC mode',
             set_cmd='sour{1}:volt:mode {0}'.format('{}', channum),
             get_cmd=f'sour{channum}:volt:mode?',
             vals=validators.Enum('fixed', 'list', 'sweep')
@@ -1802,9 +1863,21 @@ def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
+        # Stop markers
+        channel = self._get_channel(0)
+        channel.write_channel(f'sour{"{0}"}:dc:mark:sst 0')
+        # Stop any lists
+        for contact_index in range(self._arrangement.shape):
+            channel = self._get_channel(contact_index)
+            channel.dc_abort()
+            channel.write_channel(f'sour{"{0}"}:dc:trig:sour imm')
         # Let Arrangement take care of freeing triggers
         return False
 
+    def close(self) -> None:
+        self.__exit__(None, None, None)
+        self._arrangement.close()
+
     def actual_values_V(self, contact: str) -> np.ndarray:
         """The corrected values that would actually be sent to the contact
 
@@ -1879,15 +1952,24 @@ def __init__(self, qdac: 'QDac2', contacts: Dict[str, int],
         self._fix_contact_order(contacts)
         self._allocate_triggers(internal_triggers, output_triggers)
         self._outer_trigger_channel = outer_trigger_channel
+        self._outer_trigger_context: Optional[Sine_Context] = None
         self._correction = np.identity(self.shape)
 
     def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
+        if self._external_triggers:
+            for port in self._external_triggers.values():
+                self._qdac.write(f'outp:trig{port}:sour hold')
+        if self._outer_trigger_context:
+            self._outer_trigger_context.close()
         self._free_triggers()
         return False
 
+    def close(self) -> None:
+        self.__exit__(None, None, None)
+
     @property
     def shape(self) -> int:
         """Number of contacts in the arrangement"""
@@ -2141,7 +2223,6 @@ def _setup_outer_trigger(self, outer_step_trigger: str,
         if not self._outer_trigger_channel:
             raise ValueError("Arrangement needs an outer_trigger_channel when"
                              " using outer_step_trigger")
-            return
         helper_ch = self._qdac.channel(self._outer_trigger_channel)
         helper_ctx = helper_ch.sine_wave(
             period_s=period_s, repetitions=outer_cycles, span_V=0)
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_abstract_channel.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_abstract_channel.py
index c802bf275..e27a74ebc 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_abstract_channel.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_abstract_channel.py
@@ -8,7 +8,7 @@ def test_various_operations_have_common_functions(qdac):  # noqa
         qdac.ch02.sine_wave(),
         qdac.ch03.triangle_wave(),
         qdac.ch04.dc_sweep(start_V=-1, stop_V=1, points=11),
-        qdac.ch05.dc_list(voltages=(-1,0,1)),
+        qdac.ch05.dc_list(voltages=(-1, 0, 1)),
         qdac.ch05.measurement()
     ]
     # -----------------------------------------------------------------------
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_arrangement.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_arrangement.py
index f2d58dc3b..2652fe4cf 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_arrangement.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_arrangement.py
@@ -46,7 +46,7 @@ def test_arrangement_set_virtual_voltage_effectuated_immediately(qdac):  # noqa
     ]
 
 
-def test_arrangement_context_releases_trigger(qdac):  # noqa
+def test_arrangement_releases_trigger(qdac):  # noqa
     before = len(qdac._internal_triggers)
     # -----------------------------------------------------------------------
     with qdac.arrange(contacts={}, output_triggers={'dmm': 4}):
@@ -56,6 +56,62 @@ def test_arrangement_context_releases_trigger(qdac):  # noqa
     assert before == after
 
 
+def test_arrangement_cleanup_on_exit(qdac):  # noqa
+    qdac._set_up_internal_triggers()
+    # -----------------------------------------------------------------------
+    with qdac.arrange(contacts={'gate1': 1, 'gate2': 2},
+                      output_triggers={'dmm': 4, 'vna': 5},
+                      internal_triggers=('wave',), outer_trigger_channel=3
+                      ) as arrangement:
+        with arrangement.virtual_sweep2d(
+            inner_contact='gate1', inner_voltages=np.linspace(-0.2, 0.6, 5),
+            outer_contact='gate2', outer_voltages=np.linspace(-0.7, 0.15, 5),
+            inner_step_trigger='dmm', outer_step_trigger='vna'
+        ):
+            qdac.start_recording_scpi()
+    # -----------------------------------------------------------------------
+    assert qdac.get_recorded_scpi_commands() == [
+        'sour1:dc:mark:sst 0',
+        'sour1:dc:abor',
+        'sour1:dc:trig:sour imm',
+        'sour2:dc:abor',
+        'sour2:dc:trig:sour imm',
+        'outp:trig4:sour hold',
+        'outp:trig5:sour hold',
+        'sour3:sine:abor',
+        'sour3:sine:mark:pstart 0',
+        'sour3:sine:trig:sour imm'
+    ]
+
+
+def test_arrangement_cleanup_on_close(qdac):  # noqa
+    qdac._set_up_internal_triggers()
+    arrangement = qdac.arrange(
+        contacts={'gate1': 1, 'gate2': 2},
+        output_triggers={'dmm': 4, 'vna': 5},
+        internal_triggers=('wave',), outer_trigger_channel=3)
+    sweep = arrangement.virtual_sweep2d(
+        inner_contact='gate1', inner_voltages=np.linspace(-0.2, 0.6, 5),
+        outer_contact='gate2', outer_voltages=np.linspace(-0.7, 0.15, 5),
+        inner_step_trigger='dmm', outer_step_trigger='vna')
+    qdac.start_recording_scpi()
+    # -----------------------------------------------------------------------
+    sweep.close()
+    # -----------------------------------------------------------------------
+    assert qdac.get_recorded_scpi_commands() == [
+        'sour1:dc:mark:sst 0',
+        'sour1:dc:abor',
+        'sour1:dc:trig:sour imm',
+        'sour2:dc:abor',
+        'sour2:dc:trig:sour imm',
+        'outp:trig4:sour hold',
+        'outp:trig5:sour hold',
+        'sour3:sine:abor',
+        'sour3:sine:mark:pstart 0',
+        'sour3:sine:trig:sour imm'
+    ]
+
+
 def test_arrangement_set_virtual_voltage_affects_whole_arrangement(qdac):  # noqa
     arrangement = qdac.arrange(contacts={'gate1': 1, 'gate2': 2, 'gate3': 3})
     arrangement.initiate_correction('gate1', [1.0, 0.5, -0.5])
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_array.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_array.py
index 45fbe4080..78dc5dcd5 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_array.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_array.py
@@ -1,5 +1,5 @@
 import pytest
-from unittest.mock import MagicMock, call
+from unittest.mock import call
 from qcodes_contrib_drivers.drivers.QDevil.QDAC2 import QDac2
 from qcodes_contrib_drivers.drivers.QDevil.QDAC2_Array import QDac2_Array
 from .sim_qdac2_fixtures import qdac, qdac2  # noqa
@@ -96,7 +96,7 @@ def test_fails_on_non_unique_contact_names(qdac, qdac2):  # noqa
             listener: {'sensorA': 2, 'plungerB': 3}
         })
     # -----------------------------------------------------------------------
-    assert f'Contact name sensorA used multiple times' in repr(error)
+    assert 'Contact name sensorA used multiple times' in repr(error)
 
 
 def test_internal_connect_to_trigger_out(qdac, qdac2):  # noqa
@@ -176,7 +176,7 @@ def test_set_virtual_voltages_goes_to_correct_qdac(qdac, qdac2):  # noqa
 
 
 def test_sync_steady_state(qdac, qdac2, mocker):  # noqa
-    sleep_s = mocker.patch('qcodes_contrib_drivers.drivers.QDevil.QDAC2_Array.sleep_s') # Don't sleep
+    sleep_s = mocker.patch('qcodes_contrib_drivers.drivers.QDevil.QDAC2_Array.sleep_s')  # Don't sleep
     qdacs, controller, listener = two_qdacs(qdac, qdac2)
     contacts = {controller: {'A': 2, 'B': 1}, listener: {'C': 3}}
     arrangement = qdacs.arrange(contacts)
@@ -208,7 +208,7 @@ def test_sync_steady_state(qdac, qdac2, mocker):  # noqa
 
 
 def test_sync_leakage(qdac, qdac2, mocker):  # noqa
-    sleep_s = mocker.patch('qcodes_contrib_drivers.drivers.QDevil.QDAC2_Array.sleep_s') # Don't sleep
+    mocker.patch('qcodes_contrib_drivers.drivers.QDevil.QDAC2_Array.sleep_s')  # Don't sleep
     qdacs, controller, listener = two_qdacs(qdac, qdac2)
     contacts = {controller: {'A': 3}, listener: {'B': 1, 'C': 2}}
     arrangement = qdacs.arrange(contacts)
@@ -298,7 +298,7 @@ def test_frees_internal_triggers_on_exit(qdac, qdac2):  # noqa
     qdacs, controller, listener = two_qdacs(qdac, qdac2)
     contacts = {controller: {'A': 2, 'B': 1}, listener: {'C': 3}}
     # -----------------------------------------------------------------------
-    with qdacs.arrange(contacts, internal_triggers=['starter']) as arrangement:
+    with qdacs.arrange(contacts, internal_triggers=['starter']):
         pass
     # -----------------------------------------------------------------------
     assert qdac.n_triggers() == len(qdac._internal_triggers)
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_awg.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_awg.py
index bf53840aa..935905b24 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_awg.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_awg.py
@@ -292,7 +292,7 @@ def test_awg_trigger_on_internal(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour5:awg:trig:sour int{trigger.value}',
-        f'sour5:awg:init:cont on',
+        'sour5:awg:init:cont on',
     ]
 
 
@@ -306,7 +306,7 @@ def test_awg_trigger_once_on_internal(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour5:awg:trig:sour int{trigger.value}',
-        f'sour5:awg:init:cont off',
+        'sour5:awg:init:cont off',
     ]
 
 
@@ -320,7 +320,7 @@ def test_awg_trigger_on_external(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour5:awg:trig:sour ext{trigger}',
-        f'sour5:awg:init:cont on',
+        'sour5:awg:init:cont on',
     ]
 
 
@@ -334,5 +334,5 @@ def test_awg_trigger_once_on_external(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour5:awg:trig:sour ext{trigger}',
-        f'sour5:awg:init:cont off',
+        'sour5:awg:init:cont off',
     ]
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_current.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_current.py
index 0d81d4734..847803270 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_current.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_current.py
@@ -36,7 +36,6 @@ def test_measurement_aperture(qdac):  # noqa
     )
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
-        #'sens2:trig:sour hold',
         'sens2:del 0.001',
         'sens2:rang low',
         'sens2:aper 0.001',
@@ -68,7 +67,7 @@ def test_measurement_trigger_on_internal(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sens2:trig:sour int{trigger.value}',
-        f'sens2:init:cont on',
+        'sens2:init:cont on',
     ]
 
 
@@ -81,7 +80,7 @@ def test_measurement_trigger_once_on_internal(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sens2:trig:sour int{trigger.value}',
-        f'sens2:init:cont off',
+        'sens2:init:cont off',
     ]
 
 
@@ -107,7 +106,7 @@ def test_measurement_trigger_on_external(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sens2:trig:sour ext{trigger}',
-        f'sens2:init:cont on',
+        'sens2:init:cont on',
     ]
 
 
@@ -120,7 +119,7 @@ def test_measurement_trigger_once_on_external(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sens2:trig:sour ext{trigger}',
-        f'sens2:init:cont off',
+        'sens2:init:cont off',
     ]
 
 
@@ -349,3 +348,58 @@ def test_current_trigger_on_internal(qdac):  # noqa
     assert qdac.get_recorded_scpi_commands() == [
         f'sens2:trig:sour int{trigger.value}'
     ]
+
+
+def test_current_cleanup_triggering_on_exit(qdac):  # noqa
+    # -----------------------------------------------------------------------
+    with qdac.ch02.measurement():
+        qdac.start_recording_scpi()
+    # -----------------------------------------------------------------------
+    assert qdac.get_recorded_scpi_commands() == [
+        'sens2:abor',
+        'sens2:trig:sour imm'
+    ]
+
+
+def test_current_trigger_is_deallocated_on_exit(qdac):  # noqa
+    qdac._set_up_internal_triggers()
+    trigger = qdac.allocate_trigger()
+    # -----------------------------------------------------------------------
+    with qdac.ch02.measurement() as measurement:
+        measurement.start_on(trigger)
+        qdac.start_recording_scpi()
+    # -----------------------------------------------------------------------
+    assert qdac.get_recorded_scpi_commands() == [
+        'sens2:abor',
+        'sens2:trig:sour imm'
+    ]
+    assert trigger.value in qdac._internal_triggers
+
+
+def test_current_external_trigger_is_dismissed_on_exit(qdac):  # noqa
+    trigger = ExternalInput(2)
+    # -----------------------------------------------------------------------
+    with qdac.ch02.measurement() as measurement:
+        measurement.start_on_external(trigger)
+        qdac.start_recording_scpi()
+    # -----------------------------------------------------------------------
+    assert qdac.get_recorded_scpi_commands() == [
+        'sens2:abor',
+        'sens2:trig:sour imm'
+    ]
+
+
+def test_current_trigger_is_removed_on_close(qdac):  # noqa
+    qdac._set_up_internal_triggers()
+    trigger = qdac.allocate_trigger()
+    measurement = qdac.ch02.measurement()
+    measurement.start_on(trigger)
+    qdac.start_recording_scpi()
+    # -----------------------------------------------------------------------
+    measurement.close()
+    # -----------------------------------------------------------------------
+    assert qdac.get_recorded_scpi_commands() == [
+        'sens2:abor',
+        'sens2:trig:sour imm'
+    ]
+    assert trigger.value in qdac._internal_triggers
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py
index 1fc33e2c8..81e315592 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py
@@ -3,6 +3,7 @@
 from qcodes.instrument.base import Instrument
 from .sim_qdac2_fixtures import visalib
 
+
 @pytest.mark.parametrize('version,components', [
     ('3-0.9.6', ['3', '0.9.6']),
     ('10.2-1.14', ['10.2', '1.14'])
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_leakage.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_leakage.py
index 6722ed27f..5477ca57b 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_leakage.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_leakage.py
@@ -14,8 +14,8 @@ def test_diff_matrix():
     assert np.allclose(diff, expected)
 
 
-def test_arrangement_steady_state(qdac, mocker):
-    sleep_s = mocker.patch('qcodes_contrib_drivers.drivers.QDevil.QDAC2.sleep_s') # Don't sleep
+def test_arrangement_steady_state(qdac, mocker):  # noqa
+    sleep_s = mocker.patch('qcodes_contrib_drivers.drivers.QDevil.QDAC2.sleep_s')  # Don't sleep
     gates = {'sensor1': 1, 'plunger2': 2, 'plunger3': 3}
     arrangement = qdac.arrange(gates)
     qdac.start_recording_scpi()
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_sine.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_sine.py
index a65a7c6ae..3e4a82677 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_sine.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_sine.py
@@ -233,7 +233,7 @@ def test_sine_trigger_on_internal(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour1:sine:trig:sour int{trigger.value}',
-        f'sour1:sine:init:cont on',
+        'sour1:sine:init:cont on',
     ]
 
 
@@ -246,5 +246,5 @@ def test_sine_trigger_on_external(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour1:sine:trig:sour ext{trigger}',
-        f'sour1:sine:init:cont on',
+        'sour1:sine:init:cont on',
     ]
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_dc.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_dc.py
index b6b1d0f54..374b2c5be 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_dc.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_dc.py
@@ -30,7 +30,7 @@ def test_voltage_range_low_min(qdac):  # noqa
     voltage = qdac.ch02.output_low_range_minimum_V()
     # -----------------------------------------------------------------------
     assert -10 < voltage < 10
-    assert qdac.get_recorded_scpi_commands() == [f'sour2:rang:low:min?']
+    assert qdac.get_recorded_scpi_commands() == ['sour2:rang:low:min?']
 
 
 def test_voltage_range_low_max(qdac):  # noqa
@@ -38,7 +38,7 @@ def test_voltage_range_low_max(qdac):  # noqa
     voltage = qdac.ch02.output_low_range_maximum_V()
     # -----------------------------------------------------------------------
     assert -10 < voltage < 10
-    assert qdac.get_recorded_scpi_commands() == [f'sour2:rang:low:max?']
+    assert qdac.get_recorded_scpi_commands() == ['sour2:rang:low:max?']
 
 
 def test_voltage_range_high_min(qdac):  # noqa
@@ -46,7 +46,7 @@ def test_voltage_range_high_min(qdac):  # noqa
     voltage = qdac.ch02.output_high_range_minimum_V()
     # -----------------------------------------------------------------------
     assert -10 < voltage < 10
-    assert qdac.get_recorded_scpi_commands() == [f'sour2:rang:high:min?']
+    assert qdac.get_recorded_scpi_commands() == ['sour2:rang:high:min?']
 
 
 def test_voltage_range_high_max(qdac):  # noqa
@@ -54,7 +54,7 @@ def test_voltage_range_high_max(qdac):  # noqa
     voltage = qdac.ch02.output_high_range_maximum_V()
     # -----------------------------------------------------------------------
     assert -10 < voltage < 10
-    assert qdac.get_recorded_scpi_commands() == [f'sour2:rang:high:max?']
+    assert qdac.get_recorded_scpi_commands() == ['sour2:rang:high:max?']
 
 
 @pytest.mark.parametrize('selector', ['dc', 'med', 'high'])
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_list.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_list.py
index 2a99eaaf6..d66ff8fba 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_list.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_list.py
@@ -230,7 +230,7 @@ def test_list_trigger_on_internal(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour1:dc:trig:sour int{trigger.value}',
-        f'sour1:dc:init:cont on',
+        'sour1:dc:init:cont on',
     ]
 
 
@@ -243,7 +243,7 @@ def test_list_trigger_on_external(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour1:dc:trig:sour ext{trigger}',
-        f'sour1:dc:init:cont on',
+        'sour1:dc:init:cont on',
     ]
 
 
@@ -276,7 +276,7 @@ def test_list_get_voltages(qdac):  # noqa
 
 def test_list_cleanup_triggering_on_exit(qdac):  # noqa
     # -----------------------------------------------------------------------
-    with qdac.ch01.dc_list(voltages=range(1, 5)) as dc_list:
+    with qdac.ch01.dc_list(voltages=range(1, 5)):
         qdac.start_recording_scpi()
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
@@ -371,3 +371,19 @@ def test_list_step_end_marker_is_removed_on_exit(qdac):  # noqa
         'sour1:dc:trig:sour imm'
     ]
     assert trigger.value in qdac._internal_triggers
+
+
+def test_list_step_end_marker_is_removed_on_close(qdac):  # noqa
+    qdac._set_up_internal_triggers()
+    dc_list = qdac.ch01.dc_list(voltages=range(1, 5))
+    trigger = dc_list.step_end_marker()
+    qdac.start_recording_scpi()
+    # -----------------------------------------------------------------------
+    dc_list.close()
+    # -----------------------------------------------------------------------
+    assert qdac.get_recorded_scpi_commands() == [
+        'sour1:dc:abor',
+        'sour1:dc:mark:send 0',
+        'sour1:dc:trig:sour imm'
+    ]
+    assert trigger.value in qdac._internal_triggers
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_sweep.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_sweep.py
index bb5971a9c..4358b7e31 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_sweep.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_sweep.py
@@ -235,7 +235,7 @@ def test_sweep_trigger_on_internal(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour1:dc:trig:sour int{trigger.value}',
-        f'sour1:dc:init:cont on',
+        'sour1:dc:init:cont on',
     ]
 
 
@@ -248,7 +248,7 @@ def test_sweep_trigger_on_external(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour1:dc:trig:sour ext{trigger}',
-        f'sour1:dc:init:cont on',
+        'sour1:dc:init:cont on',
     ]
 
 
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_square.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_square.py
index a685224c1..e236fc032 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_square.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_square.py
@@ -286,7 +286,7 @@ def test_square_trigger_on_internal(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour1:squ:trig:sour int{trigger.value}',
-        f'sour1:squ:init:cont on',
+        'sour1:squ:init:cont on',
     ]
 
 
@@ -299,7 +299,7 @@ def test_square_trigger_on_external(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour1:squ:trig:sour ext{trigger}',
-        f'sour1:squ:init:cont on',
+        'sour1:squ:init:cont on',
     ]
 
 
@@ -389,3 +389,19 @@ def test_square_period_end_marker_is_removed_on_exit(qdac):  # noqa
         'sour1:squ:trig:sour imm'
     ]
     assert trigger.value in qdac._internal_triggers
+
+
+def test_square_period_end_marker_is_removed_on_close(qdac):  # noqa
+    qdac._set_up_internal_triggers()
+    square = qdac.ch01.square_wave(frequency_Hz=1000)
+    trigger = square.period_end_marker()
+    qdac.start_recording_scpi()
+    # -----------------------------------------------------------------------
+    square.close()
+    # -----------------------------------------------------------------------
+    assert qdac.get_recorded_scpi_commands() == [
+        'sour1:squ:abor',
+        'sour1:squ:mark:pend 0',
+        'sour1:squ:trig:sour imm'
+    ]
+    assert trigger.value in qdac._internal_triggers
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_triangle.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_triangle.py
index 86a29a065..f9f20c559 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_triangle.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_triangle.py
@@ -260,7 +260,7 @@ def test_triangle_trigger_on_internal(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour1:tri:trig:sour int{trigger.value}',
-        f'sour1:tri:init:cont on',
+        'sour1:tri:init:cont on',
     ]
 
 
@@ -273,5 +273,5 @@ def test_triangle_trigger_on_external(qdac):  # noqa
     # -----------------------------------------------------------------------
     assert qdac.get_recorded_scpi_commands() == [
         f'sour1:tri:trig:sour ext{trigger}',
-        f'sour1:tri:init:cont on',
+        'sour1:tri:init:cont on',
     ]
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_virtual_gates.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_virtual_gates.py
index bbc137247..b2420891e 100644
--- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_virtual_gates.py
+++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_virtual_gates.py
@@ -323,7 +323,7 @@ def test_arrangement_sweep_outer_trigger(qdac):  # noqa
         outer_trigger_channel=1)
     qdac.start_recording_scpi()
     # -----------------------------------------------------------------------
-    sweep = arrangement.virtual_sweep2d(
+    arrangement.virtual_sweep2d(
         inner_contact='plunger1',
         inner_voltages=np.linspace(-1, 1, 5),
         outer_contact='plunger2',