Merge remote-tracking branch 'upstream/dev' into dev

.bin/Scripts/functions/data.py

@@ -1,9 +1,8 @@
 # Wizard Kit: Functions - Data
 
 import ctypes
-import json
 
-from functions.common import *
+from functions.json import *
 from operator import itemgetter
 from settings.data import *
 

.bin/Scripts/functions/hw_diags.py

@@ -1525,6 +1525,7 @@ def run_nvme_smart_tests(state, test, update_mode=False):
       test.update_status('Aborted')
       raise GenericAbort('Aborted')
     elif dev.self_test_timed_out:
+      test.failed = True
       test.update_status('TimedOut')
     elif dev.override_disabled or 'OVERRIDE' not in test.status:
       # override_disabled is set to True if one or more critical attributes