Merge remote-tracking branch 'origin/develop' into breaking

test/cmdlineTests/standard_model_checker_timeout_chc/input.json

@@ -7,9 +7,12 @@
 			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\npragma experimental SMTChecker;\ncontract test {\nfunction f(uint x, uint y, uint k) public pure {\nrequire(k > 0); require(x % k == 0); require(y % k == 0); uint r = mulmod(x, y, k); assert(r % k == 0);}}"
 		}
 	},
-	"modelCheckerSettings":
+	"settings":
 	{
-		"engine": "chc",
-		"timeout": 1000
+		"modelChecker":
+		{
+			"engine": "chc",
+			"timeout": 1000
+		}
 	}
 }