Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}