Staged for activation after pytest_cleanup reaches master.