From e2b05efb27ee74c53d6e78dbe23774cefaa42af2 Mon Sep 17 00:00:00 2001
From: Nils Werner <64034005+nils-werner-sonarsource@users.noreply.github.com>
Date: Fri, 5 Nov 2021 15:39:52 +0100
Subject: [PATCH] Update rule metadata (#985)

---
 .../l10n/py/rules/python/BackticksUsage.json  |   3 +-
 .../l10n/py/rules/python/ClassComplexity.json |   3 +-
 .../python/CommentRegularExpression.json      |   3 +-
 .../py/rules/python/ExecStatementUsage.json   |   3 +-
 .../l10n/py/rules/python/FileComplexity.json  |   3 +-
 .../py/rules/python/FunctionComplexity.json   |   3 +-
 .../l10n/py/rules/python/InequalityUsage.json |   3 +-
 .../l10n/py/rules/python/LineLength.json      |   3 +-
 .../LongIntegerWithLowercaseSuffixUsage.json  |   3 +-
 .../py/rules/python/OneStatementPerLine.json  |   3 +-
 .../l10n/py/rules/python/ParsingError.json    |   3 +-
 .../rules/python/PreIncrementDecrement.json   |   3 +-
 .../py/rules/python/PrintStatementUsage.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S100.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S101.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S104.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S1045.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S1066.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S107.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S108.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S1110.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S112.html  |   3 +-
 .../org/sonar/l10n/py/rules/python/S112.json  |   6 +-
 .../org/sonar/l10n/py/rules/python/S113.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S1131.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1134.html |   2 +-
 .../org/sonar/l10n/py/rules/python/S1134.json |   5 +-
 .../org/sonar/l10n/py/rules/python/S1142.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1143.json |   8 +-
 .../org/sonar/l10n/py/rules/python/S1144.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S116.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S117.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S1186.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1192.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1226.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S125.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S1313.html |   2 +-
 .../org/sonar/l10n/py/rules/python/S1313.json |   4 +-
 .../org/sonar/l10n/py/rules/python/S134.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S139.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S1481.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1515.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1523.html |   8 +-
 .../org/sonar/l10n/py/rules/python/S1523.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S1542.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1578.html |   4 -
 .../org/sonar/l10n/py/rules/python/S1578.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S1656.html |   5 -
 .../org/sonar/l10n/py/rules/python/S1656.json |   8 +-
 .../org/sonar/l10n/py/rules/python/S1700.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1707.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1716.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1717.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1720.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1721.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1722.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1751.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1763.html |   5 +-
 .../org/sonar/l10n/py/rules/python/S1763.json |   9 +-
 .../org/sonar/l10n/py/rules/python/S1764.html |   2 -
 .../org/sonar/l10n/py/rules/python/S1764.json |   8 +-
 .../org/sonar/l10n/py/rules/python/S1845.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S1854.html |   4 +-
 .../org/sonar/l10n/py/rules/python/S1854.json |   9 +-
 .../org/sonar/l10n/py/rules/python/S1862.html |   5 -
 .../org/sonar/l10n/py/rules/python/S1862.json |   8 +-
 .../org/sonar/l10n/py/rules/python/S1871.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2053.html |   5 +-
 .../org/sonar/l10n/py/rules/python/S2053.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S2068.html |   9 +-
 .../org/sonar/l10n/py/rules/python/S2068.json |   4 +-
 .../org/sonar/l10n/py/rules/python/S2077.html |   4 +-
 .../org/sonar/l10n/py/rules/python/S2077.json |   4 +-
 .../org/sonar/l10n/py/rules/python/S2092.html |   9 +-
 .../org/sonar/l10n/py/rules/python/S2092.json |   4 +
 .../org/sonar/l10n/py/rules/python/S2115.html |   2 +
 .../org/sonar/l10n/py/rules/python/S2115.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S2159.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S2190.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2201.html |   2 -
 .../org/sonar/l10n/py/rules/python/S2201.json |   7 +-
 .../org/sonar/l10n/py/rules/python/S2208.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2245.html |   5 +-
 .../org/sonar/l10n/py/rules/python/S2245.json |  10 +-
 .../org/sonar/l10n/py/rules/python/S2257.html |   3 +-
 .../org/sonar/l10n/py/rules/python/S2257.json |   3 +
 .../org/sonar/l10n/py/rules/python/S2275.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S2325.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2612.html |   8 +-
 .../org/sonar/l10n/py/rules/python/S2612.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S2638.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2710.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2711.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2712.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2733.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2734.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2737.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2755.html |   5 +-
 .../org/sonar/l10n/py/rules/python/S2755.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S2757.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2772.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2823.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S2836.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S3329.html |   7 +-
 .../org/sonar/l10n/py/rules/python/S3329.json |  13 ++-
 .../org/sonar/l10n/py/rules/python/S3330.html |   5 +-
 .../org/sonar/l10n/py/rules/python/S3330.json |   4 +-
 .../org/sonar/l10n/py/rules/python/S3358.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S3403.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S3457.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S3516.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S3626.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S3752.html |   2 +
 .../org/sonar/l10n/py/rules/python/S3752.json |   4 +
 .../org/sonar/l10n/py/rules/python/S3776.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S3827.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S3862.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S3923.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S3981.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S3984.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S3985.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S4143.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S4144.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S4423.html |   3 +
 .../org/sonar/l10n/py/rules/python/S4423.json |   7 +-
 .../org/sonar/l10n/py/rules/python/S4426.html |   1 +
 .../org/sonar/l10n/py/rules/python/S4426.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S4433.html |   4 +-
 .../org/sonar/l10n/py/rules/python/S4433.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S4487.json |   7 +-
 .../org/sonar/l10n/py/rules/python/S4502.html |   1 +
 .../org/sonar/l10n/py/rules/python/S4502.json |   3 +
 .../org/sonar/l10n/py/rules/python/S4507.html |   9 +-
 .../org/sonar/l10n/py/rules/python/S4507.json |   3 +
 .../org/sonar/l10n/py/rules/python/S4721.html |   7 +-
 .../org/sonar/l10n/py/rules/python/S4721.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S4784.html |   2 +-
 .../org/sonar/l10n/py/rules/python/S4787.html |  14 +--
 .../org/sonar/l10n/py/rules/python/S4790.html |   5 +-
 .../org/sonar/l10n/py/rules/python/S4790.json |   7 +-
 .../org/sonar/l10n/py/rules/python/S4792.html |   5 +-
 .../org/sonar/l10n/py/rules/python/S4792.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S4830.html |   4 +
 .../org/sonar/l10n/py/rules/python/S4830.json |   9 +-
 .../org/sonar/l10n/py/rules/python/S5042.html | 100 ++++++++++++++++--
 .../org/sonar/l10n/py/rules/python/S5042.json |   5 +-
 .../org/sonar/l10n/py/rules/python/S5122.html |   3 +
 .../org/sonar/l10n/py/rules/python/S5122.json |   4 +
 .../org/sonar/l10n/py/rules/python/S5247.html |   6 +-
 .../org/sonar/l10n/py/rules/python/S5247.json |  13 +--
 .../org/sonar/l10n/py/rules/python/S5332.html |  48 ++++++---
 .../org/sonar/l10n/py/rules/python/S5332.json |   3 +
 .../org/sonar/l10n/py/rules/python/S5439.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5443.html |   7 +-
 .../org/sonar/l10n/py/rules/python/S5443.json |   3 +
 .../org/sonar/l10n/py/rules/python/S5445.html |   7 +-
 .../org/sonar/l10n/py/rules/python/S5445.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S5527.html |   4 +
 .../org/sonar/l10n/py/rules/python/S5527.json |  11 +-
 .../org/sonar/l10n/py/rules/python/S5542.html |   1 +
 .../org/sonar/l10n/py/rules/python/S5542.json |   7 +-
 .../org/sonar/l10n/py/rules/python/S5547.html |   1 +
 .../org/sonar/l10n/py/rules/python/S5547.json |   7 +-
 .../org/sonar/l10n/py/rules/python/S5549.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5603.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5607.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5632.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5644.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5655.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5659.html |   1 +
 .../org/sonar/l10n/py/rules/python/S5659.json |   6 +-
 .../org/sonar/l10n/py/rules/python/S5685.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5704.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5706.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5707.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5708.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5709.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5712.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5713.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5714.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5717.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5719.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5720.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5722.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5724.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5727.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5747.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5754.html |   2 +-
 .../org/sonar/l10n/py/rules/python/S5754.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5756.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5780.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5781.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5795.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5796.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5797.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5799.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5806.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5807.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5828.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5843.html |  37 +++++++
 .../org/sonar/l10n/py/rules/python/S5864.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5868.html |   4 +-
 .../org/sonar/l10n/py/rules/python/S5886.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5890.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S5953.json |   3 +-
 .../org/sonar/l10n/py/rules/python/S6035.html |   2 +-
 .../org/sonar/l10n/py/rules/python/S905.html  |   2 +-
 .../org/sonar/l10n/py/rules/python/S905.json  |   3 +-
 .../org/sonar/l10n/py/rules/python/S930.html  |   6 +-
 .../org/sonar/l10n/py/rules/python/S930.json  |   7 +-
 .../py/rules/python/Sonar_way_profile.json    |   2 +
 sonarpedia.json                               |   2 +-
 212 files changed, 661 insertions(+), 378 deletions(-)

diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/BackticksUsage.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/BackticksUsage.json
index 88e0932ac6..a30d384990 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/BackticksUsage.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/BackticksUsage.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-2316",
   "sqKey": "BackticksUsage",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/ClassComplexity.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/ClassComplexity.json
index e44cfda796..3281a65e91 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/ClassComplexity.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/ClassComplexity.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-1311",
   "sqKey": "ClassComplexity",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/CommentRegularExpression.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/CommentRegularExpression.json
index efd5fe7416..e8530b4cf5 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/CommentRegularExpression.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/CommentRegularExpression.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-124",
   "sqKey": "CommentRegularExpression",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/ExecStatementUsage.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/ExecStatementUsage.json
index 6e31982048..82a48e43cb 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/ExecStatementUsage.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/ExecStatementUsage.json
@@ -13,5 +13,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-2317",
   "sqKey": "ExecStatementUsage",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/FileComplexity.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/FileComplexity.json
index 88d3e32985..ca41433aa6 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/FileComplexity.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/FileComplexity.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1908",
   "sqKey": "FileComplexity",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/FunctionComplexity.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/FunctionComplexity.json
index 36e6871cc1..d3a956d609 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/FunctionComplexity.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/FunctionComplexity.json
@@ -14,5 +14,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-1541",
   "sqKey": "FunctionComplexity",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/InequalityUsage.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/InequalityUsage.json
index 0d1c5fb625..33f59e1165 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/InequalityUsage.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/InequalityUsage.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2318",
   "sqKey": "InequalityUsage",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/LineLength.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/LineLength.json
index fa18cb1575..8389c57f71 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/LineLength.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/LineLength.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-103",
   "sqKey": "LineLength",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/LongIntegerWithLowercaseSuffixUsage.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/LongIntegerWithLowercaseSuffixUsage.json
index 7f27a828c6..2a40c8d8a8 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/LongIntegerWithLowercaseSuffixUsage.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/LongIntegerWithLowercaseSuffixUsage.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1129",
   "sqKey": "LongIntegerWithLowercaseSuffixUsage",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/OneStatementPerLine.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/OneStatementPerLine.json
index 3577def030..b804d1c612 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/OneStatementPerLine.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/OneStatementPerLine.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-122",
   "sqKey": "OneStatementPerLine",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/ParsingError.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/ParsingError.json
index 0f96bfb351..d64462f4c8 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/ParsingError.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/ParsingError.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2260",
   "sqKey": "ParsingError",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/PreIncrementDecrement.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/PreIncrementDecrement.json
index 018c6968a1..7781469ebb 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/PreIncrementDecrement.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/PreIncrementDecrement.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2319",
   "sqKey": "PreIncrementDecrement",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/PrintStatementUsage.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/PrintStatementUsage.json
index b068843d12..c54250ce00 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/PrintStatementUsage.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/PrintStatementUsage.json
@@ -13,5 +13,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2320",
   "sqKey": "PrintStatementUsage",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S100.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S100.json
index f2dd7bf21f..d33ba17407 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S100.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S100.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-100",
   "sqKey": "S100",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S101.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S101.json
index 2872c88159..a3f372d5ec 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S101.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S101.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-101",
   "sqKey": "S101",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S104.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S104.json
index 7381ba6d9d..fb141bb6c4 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S104.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S104.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-104",
   "sqKey": "S104",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1045.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1045.json
index a6d09d42b2..97eac449e3 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1045.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1045.json
@@ -11,9 +11,5 @@
   "ruleSpecification": "RSPEC-1045",
   "sqKey": "S1045",
   "scope": "Main",
-  "securityStandards": {
-    "CERT": [
-      "ERR54-CPP."
-    ]
-  }
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1066.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1066.json
index b0e3e270e1..16f59cf6f3 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1066.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1066.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1066",
   "sqKey": "S1066",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S107.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S107.json
index 6769f2ea46..806b00323b 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S107.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S107.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-107",
   "sqKey": "S107",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S108.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S108.json
index 00df66a88c..4061cc7fe9 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S108.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S108.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-108",
   "sqKey": "S108",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1110.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1110.json
index d64788b56c..c154ef1314 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1110.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1110.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1110",
   "sqKey": "S1110",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S112.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S112.html
index dcac633849..df5d772bc8 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S112.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S112.html
@@ -86,7 +86,6 @@ <h2>See</h2>
 <ul>
   <li> PEP 352 - <a href="https://www.python.org/dev/peps/pep-0352/#exception-hierarchy-changes">Required Superclass for Exceptions</a> </li>
   <li> Python Documentation - <a href="https://docs.python.org/3/library/exceptions.html#BaseException">Built-in exceptions</a> </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/397.html">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/_DdGBQ">CERT, ERR07-J.</a> - Do not throw RuntimeException, Exception, or Throwable </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/397.html">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S112.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S112.json
index 17e8b66d5c..dc97fd0683 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S112.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S112.json
@@ -17,9 +17,7 @@
   "securityStandards": {
     "CWE": [
       397
-    ],
-    "CERT": [
-      "ERR07-J."
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S113.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S113.json
index 104eb8ac17..12bc3b90c9 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S113.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S113.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-113",
   "sqKey": "S113",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1131.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1131.json
index b926d3b723..aac7ccdf90 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1131.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1131.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1131",
   "sqKey": "S1131",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1134.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1134.html
index eee5db9c95..69ba8d7136 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1134.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1134.html
@@ -8,6 +8,6 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1134.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1134.json
index ebf8149c01..d4579b29bd 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1134.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1134.json
@@ -12,10 +12,11 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1134",
   "sqKey": "S1134",
-  "scope": "All",
+  "scope": "Main",
   "securityStandards": {
     "CWE": [
       546
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1142.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1142.json
index cf4b37957f..ea733ddb92 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1142.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1142.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1142",
   "sqKey": "S1142",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1143.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1143.json
index 92fbb8f70a..f3f11a4f8f 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1143.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1143.json
@@ -13,13 +13,11 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-1143",
   "sqKey": "S1143",
-  "scope": "All",
+  "scope": "Main",
   "securityStandards": {
     "CWE": [
       584
-    ],
-    "CERT": [
-      "ERR04-J."
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1144.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1144.json
index e87f6bbb0c..afb260c097 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1144.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1144.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1144",
   "sqKey": "S1144",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S116.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S116.json
index 2f4c5bf171..e49795d477 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S116.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S116.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-116",
   "sqKey": "S116",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S117.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S117.json
index fb6df07c45..204b18feb6 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S117.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S117.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-117",
   "sqKey": "S117",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1186.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1186.json
index cbb5ed1046..29f3748d54 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1186.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1186.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-1186",
   "sqKey": "S1186",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1192.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1192.json
index dedd32b5ba..e42fac08c1 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1192.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1192.json
@@ -14,5 +14,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-1192",
   "sqKey": "S1192",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1226.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1226.json
index 61672a158c..cf17fe85a9 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1226.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1226.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1226",
   "sqKey": "S1226",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S125.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S125.json
index 81617e679f..e6bd6e3ddf 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S125.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S125.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-125",
   "sqKey": "S125",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1313.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1313.html
index 1a8c0f0197..3a4f29aaba 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1313.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1313.html
@@ -48,8 +48,8 @@ <h2>Exceptions</h2>
 </ul>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/OjdGBQ">CERT, MSC03-J.</a> - Never hard code sensitive information </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1313.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1313.json
index a201d777f3..b2e2c15e7e 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1313.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1313.json
@@ -17,8 +17,8 @@
     "OWASP": [
       "A3"
     ],
-    "CERT": [
-      "MSC03-J."
+    "OWASP Top 10 2021": [
+      "A1"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S134.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S134.json
index b0ba9293b6..bdc78f7bfe 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S134.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S134.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-134",
   "sqKey": "S134",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S139.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S139.json
index 8ef76bb199..88077f0cfc 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S139.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S139.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-139",
   "sqKey": "S139",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1481.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1481.json
index 699bdaa7ff..9adebb0e8a 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1481.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1481.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1481",
   "sqKey": "S1481",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1515.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1515.json
index de51af94a7..b1f21240ea 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1515.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1515.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1515",
   "sqKey": "S1515",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1523.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1523.html
index d3063a35aa..543b47fb4d 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1523.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1523.html
@@ -44,13 +44,11 @@ <h2>Sensitive Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/95.html">MITRE CWE-95</a> - Improper Neutralization of Directives in Dynamically Evaluated Code
-  ('Eval Injection') </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/95.html">MITRE, CWE-95</a> - Improper Neutralization of Directives in Dynamically Evaluated
+  Code ('Eval Injection') </li>
 </ul>
-
-<!-- Make sure to not drop this deprecation section when doing bulk update (as well as updating S1523.json and Sonar way)  -->
-<!-- This rule is deprecated only for Python language, that's why we can't deprecate in a standard way (through Jira RSPEC) -->
 <h2>Deprecated</h2>
 <p>This rule is deprecated, and will eventually be removed.</p>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1523.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1523.json
index c9ecca4d75..d10fcf98ff 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1523.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1523.json
@@ -21,6 +21,10 @@
     ],
     "OWASP": [
       "A1"
+    ],
+    "OWASP Top 10 2021": [
+      "A3"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1542.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1542.json
index 0040798c18..3860b264df 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1542.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1542.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1542",
   "sqKey": "S1542",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1578.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1578.html
index b3efdef973..0b294e31b1 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1578.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1578.html
@@ -1,6 +1,2 @@
 <p>Shared coding conventions allow teams to collaborate effectively. For that reason, module names should conform to a defined standard.</p>
-<h2>See</h2>
-<ul>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/GtYxBQ">CERT, MSC09-C.</a> - Character encoding: Use subset of ASCII for safety </li>
-</ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1578.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1578.json
index 0987cf2bdf..82c1891f50 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1578.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1578.json
@@ -13,9 +13,5 @@
   "ruleSpecification": "RSPEC-1578",
   "sqKey": "S1578",
   "scope": "Main",
-  "securityStandards": {
-    "CERT": [
-      "MSC09-C."
-    ]
-  }
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1656.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1656.html
index 2ed53abe72..3248161310 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1656.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1656.html
@@ -8,9 +8,4 @@ <h2>Compliant Solution</h2>
 <pre>
 name = other.name
 </pre>
-<h2>See</h2>
-<ul>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/5dUxBQ">CERT, MSC12-C.</a> - Detect and remove code that has no effect or is never executed
-  </li>
-</ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1656.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1656.json
index 58cd957a8a..9495556890 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1656.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1656.json
@@ -10,10 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1656",
   "sqKey": "S1656",
-  "scope": "All",
-  "securityStandards": {
-    "CERT": [
-      "MSC12-C."
-    ]
-  }
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1700.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1700.json
index 0a96bc8dba..15e9df244b 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1700.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1700.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1700",
   "sqKey": "S1700",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1707.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1707.json
index 9ca7140705..58a5bc6b46 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1707.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1707.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1707",
   "sqKey": "S1707",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1716.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1716.json
index 7021d46433..9fa857cb8c 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1716.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1716.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-1716",
   "sqKey": "S1716",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1717.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1717.json
index f47c891e6b..947cca6b0c 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1717.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1717.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1717",
   "sqKey": "S1717",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1720.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1720.json
index a36cfa6d25..d6562664aa 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1720.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1720.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1720",
   "sqKey": "S1720",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1721.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1721.json
index b9effe23ee..e40c5817bf 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1721.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1721.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1721",
   "sqKey": "S1721",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1722.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1722.json
index 75dabd7cb3..461548824a 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1722.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1722.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1722",
   "sqKey": "S1722",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1751.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1751.json
index b3dc00ddd7..3a47297aaf 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1751.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1751.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1751",
   "sqKey": "S1751",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1763.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1763.html
index 6118717051..ebaacd0726 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1763.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1763.html
@@ -15,9 +15,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/561.html">MITRE, CWE-561</a> - Dead Code </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/9DZGBQ">CERT, MSC56-J.</a> - Detect and remove superfluous code and values </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/5dUxBQ">CERT, MSC12-C.</a> - Detect and remove code that has no effect or is never executed
-  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/561.html">MITRE, CWE-561</a> - Dead Code </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1763.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1763.json
index 5232dee4ea..b1d36db010 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1763.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1763.json
@@ -13,14 +13,11 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1763",
   "sqKey": "S1763",
-  "scope": "All",
+  "scope": "Main",
   "securityStandards": {
     "CWE": [
       561
-    ],
-    "CERT": [
-      "MSC12-C.",
-      "MSC56-J."
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1764.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1764.html
index 477d8e69f4..c5dfdb4aec 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1764.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1764.html
@@ -28,8 +28,6 @@ <h2>Exceptions</h2>
 </ul>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/5dUxBQ">CERT, MSC12-C.</a> - Detect and remove code that has no effect or is never executed
-  </li>
   <li> {rule:python:S1656} - Implements a check on <code>=</code>. </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1764.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1764.json
index b56a944cdd..cdc939506f 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1764.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1764.json
@@ -10,10 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1764",
   "sqKey": "S1764",
-  "scope": "All",
-  "securityStandards": {
-    "CERT": [
-      "MSC12-C."
-    ]
-  }
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1845.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1845.json
index 7c1ee4a996..3fc5cec35d 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1845.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1845.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-1845",
   "sqKey": "S1845",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1854.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1854.html
index fea9a19d0d..80210aad13 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1854.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1854.html
@@ -19,8 +19,6 @@ <h2>Exceptions</h2>
 <p>No issue will be raised on unpacked variables.</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/563.html">MITRE, CWE-563</a> - Assignment to Variable without Use ('Unused Variable') </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/39UxBQ">CERT, MSC13-C.</a> - Detect and remove unused values </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/9DZGBQ">CERT, MSC56-J.</a> - Detect and remove superfluous code and values </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/563.html">MITRE, CWE-563</a> - Assignment to Variable without Use ('Unused Variable') </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1854.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1854.json
index 4fc3d7071e..7bd2f80edc 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1854.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1854.json
@@ -13,14 +13,11 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1854",
   "sqKey": "S1854",
-  "scope": "All",
+  "scope": "Main",
   "securityStandards": {
     "CWE": [
       563
-    ],
-    "CERT": [
-      "MSC13-C.",
-      "MSC56-J."
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1862.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1862.html
index d6f2697441..11ab473639 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1862.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1862.html
@@ -20,9 +20,4 @@ <h2>Compliant Solution</h2>
 elif param == 3:
   moveWindowToTheBackground()
 </pre>
-<h2>See</h2>
-<ul>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/5dUxBQ">CERT, MSC12-C.</a> - Detect and remove code that has no effect or is never executed
-  </li>
-</ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1862.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1862.json
index 24820ab4f6..6829fd942d 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1862.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1862.json
@@ -13,10 +13,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1862",
   "sqKey": "S1862",
-  "scope": "All",
-  "securityStandards": {
-    "CERT": [
-      "MSC12-C."
-    ]
-  }
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1871.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1871.json
index 64e8023d60..9343196d2b 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1871.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S1871.json
@@ -13,5 +13,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1871",
   "sqKey": "S1871",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2053.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2053.html
index 160558482d..88abeb56db 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2053.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2053.html
@@ -37,10 +37,11 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/759.html">MITRE, CWE-759</a> - Use of a One-Way Hash without a Salt </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/760.html">MITRE, CWE-760</a> - Use of a One-Way Hash with a Predictable Salt </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/759.html">MITRE, CWE-759</a> - Use of a One-Way Hash without a Salt </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/760.html">MITRE, CWE-760</a> - Use of a One-Way Hash with a Predictable Salt </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2053.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2053.json
index dbb2584fdd..79404b7f53 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2053.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2053.json
@@ -22,6 +22,10 @@
     ],
     "OWASP": [
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2068.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2068.html
index 5f831eacd0..3029cf53e5 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2068.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2068.html
@@ -21,7 +21,7 @@ <h2>Recommended Secure Coding Practices</h2>
   <li> Store the credentials in a configuration file that is not pushed to the code repository. </li>
   <li> Store the credentials in a database. </li>
   <li> Use your cloud provider’s service for managing secrets. </li>
-  <li> If the a password has been disclosed through the source code: change it. </li>
+  <li> If a password has been disclosed through the source code: change it. </li>
 </ul>
 <h2>Sensitive Code Example</h2>
 <pre>
@@ -39,10 +39,11 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> - Broken Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/798">MITRE, CWE-798</a> - Use of Hard-coded Credentials </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/259">MITRE, CWE-259</a> - Use of Hard-coded Password </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/OjdGBQ">CERT, MSC03-J.</a> - Never hard code sensitive information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/798.html">MITRE, CWE-798</a> - Use of Hard-coded Credentials </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/259.html">MITRE, CWE-259</a> - Use of Hard-coded Password </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#HARD_CODE_PASSWORD">Hard Coded Password</a> </li>
 </ul>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2068.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2068.json
index 219a8c69aa..1fdfc14412 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2068.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2068.json
@@ -23,8 +23,8 @@
     "OWASP": [
       "A2"
     ],
-    "CERT": [
-      "MSC03-J."
+    "OWASP Top 10 2021": [
+      "A7"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2077.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2077.html
index 102f753b2b..a7783fc1a3 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2077.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2077.html
@@ -57,14 +57,14 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/89">MITRE, CWE-89</a> - Improper Neutralization of Special Elements used in an SQL Command
+  <li> <a href="https://cwe.mitre.org/data/definitions/89.html">MITRE, CWE-89</a> - Improper Neutralization of Special Elements used in an SQL Command
   </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/564.html">MITRE, CWE-564</a> - SQL Injection: Hibernate </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/943.html">MITRE, CWE-943</a> - Improper Neutralization of Special Elements in Data Query Logic
   </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/ITdGBQ">CERT, IDS00-J.</a> - Prevent SQL injection </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
   <li> Derived from FindSecBugs rules <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JPA">Potential SQL/JPQL Injection
   (JPA)</a>, <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JDO">Potential SQL/JDOQL Injection (JDO)</a>, <a
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2077.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2077.json
index 439098b965..595d173242 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2077.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2077.json
@@ -27,8 +27,8 @@
     "OWASP": [
       "A1"
     ],
-    "CERT": [
-      "IDS00-J."
+    "OWASP Top 10 2021": [
+      "A3"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2092.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2092.html
index aee131a3f8..faaec2fba7 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2092.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2092.html
@@ -37,11 +37,14 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/311">MITRE, CWE-311</a> - Missing Encryption of Sensitive Data </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/315">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/614">MITRE, CWE-614</a> - Sensitive Cookie in HTTPS Session Without 'Secure' Attribute </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/311.html">MITRE, CWE-311</a> - Missing Encryption of Sensitive Data </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/315.html">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/614.html">MITRE, CWE-614</a> - Sensitive Cookie in HTTPS Session Without 'Secure' Attribute
+  </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2092.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2092.json
index 5a199afbef..af1fdaf1a0 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2092.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2092.json
@@ -24,6 +24,10 @@
     ],
     "OWASP": [
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A4",
+      "A5"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2115.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2115.html
index 906a500383..aa0e5cbcc7 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2115.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2115.html
@@ -59,6 +59,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication.html">OWASP Top 10 2017 Category A2</a> - Broken
   Authentication </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2115.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2115.json
index 0f8ed059f1..90d2a3a02c 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2115.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2115.json
@@ -22,6 +22,10 @@
     "OWASP": [
       "A2",
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A7"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2159.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2159.json
index 73069ebc02..a648cb37c5 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2159.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2159.json
@@ -13,9 +13,5 @@
   "ruleSpecification": "RSPEC-2159",
   "sqKey": "S2159",
   "scope": "Main",
-  "securityStandards": {
-    "CERT": [
-      "EXP02-J."
-    ]
-  }
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2190.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2190.json
index 5ef9619110..c3ffb41fb3 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2190.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2190.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-2190",
   "sqKey": "S2190",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2201.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2201.html
index 6d67e8fe02..866e6b9d4d 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2201.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2201.html
@@ -30,7 +30,5 @@ <h2>Exceptions</h2>
 <h2>See</h2>
 <ul>
   <li> <a href="https://docs.python.org/3/library/functions.html">Python documentation - Built-in Functions</a> </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/mtYxBQ">CERT, EXP12-C.</a> - Do not ignore values returned by functions </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/xzdGBQ">CERT, EXP00-J.</a> - Do not ignore values returned by methods </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2201.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2201.json
index 64048e493e..b4064e3b77 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2201.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2201.json
@@ -11,10 +11,5 @@
   "ruleSpecification": "RSPEC-2201",
   "sqKey": "S2201",
   "scope": "Main",
-  "securityStandards": {
-    "CERT": [
-      "EXP12-C.",
-      "EXP00-J."
-    ]
-  }
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2208.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2208.json
index 08cbf3cbab..3e2a1488d6 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2208.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2208.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-2208",
   "sqKey": "S2208",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2245.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2245.html
index 3ed79a493a..dce9c81e2d 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2245.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2245.html
@@ -38,6 +38,7 @@ <h2>Sensitive Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x08-v3-cryptography_verification_requirements">Mobile AppSec
@@ -49,10 +50,6 @@ <h2>See</h2>
   <li> <a href="https://cwe.mitre.org/data/definitions/330.html">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/1241.html">MITRE, CWE-1241</a> - Use of Predictable Algorithm in Random Number Generator </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/oTdGBQ">CERT, MSC02-J.</a> - Generate strong random numbers </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/UNcxBQ">CERT, MSC30-C.</a> - Do not use the rand() function for generating pseudorandom numbers
-  </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/2ns-BQ">CERT, MSC50-CPP.</a> - Do not use std::rand() for generating pseudorandom numbers </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#PREDICTABLE_RANDOM">Predictable Pseudo Random Number
   Generator</a> </li>
 </ul>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2245.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2245.json
index ec3758ffd9..ce17c74a6a 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2245.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2245.json
@@ -17,9 +17,9 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      338,
-      330,
       326,
+      330,
+      338,
       1241
     ],
     "OWASP": [
@@ -31,10 +31,8 @@
     "MASVS": [
       "MSTG-CRYPTO-6"
     ],
-    "CERT": [
-      "MSC02-J.",
-      "MSC30-C.",
-      "MSC50-CPP."
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2257.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2257.html
index 2bbad5a7da..9af3db0fea 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2257.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2257.html
@@ -12,9 +12,10 @@ <h2>Sensitive Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/327.html">CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2257.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2257.json
index 97bba67dfe..78cc7d1521 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2257.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2257.json
@@ -21,6 +21,9 @@
     ],
     "OWASP": [
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2275.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2275.json
index 4ffcd2d966..a5630444b5 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2275.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2275.json
@@ -11,9 +11,5 @@
   "ruleSpecification": "RSPEC-2275",
   "sqKey": "S2275",
   "scope": "All",
-  "securityStandards": {
-    "CERT": [
-      "FIO47-C."
-    ]
-  }
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2325.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2325.json
index 8b80b4e98f..fcd5fbb5e3 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2325.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2325.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-2325",
   "sqKey": "S2325",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2612.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2612.html
index 0b0dde18b7..18aacf39a7 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2612.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2612.html
@@ -36,14 +36,12 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Test_File_Permission_(OTG-CONFIG-009)">OWASP File Permission</a> </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/732">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/732.html">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/266.html">MITRE, CWE-266</a> - Incorrect Privilege Assignment </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/display/java/FIO01-J.+Create+files+with+appropriate+access+permissions">CERT, FIO01-J.</a> -
-  Create files with appropriate access permissions </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/display/c/FIO06-C.+Create+files+with+appropriate+access+permissions">CERT, FIO06-C.</a> - Create
-  files with appropriate access permissions </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2612.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2612.json
index 6750cadcc5..6b43a79819 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2612.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2612.json
@@ -23,9 +23,9 @@
     "OWASP": [
       "A5"
     ],
-    "CERT": [
-      "FIO01-J.",
-      "FIO06-C."
+    "OWASP Top 10 2021": [
+      "A1",
+      "A4"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2638.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2638.json
index 8d33ec5b35..9c9ea509fa 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2638.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2638.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-2638",
   "sqKey": "S2638",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2710.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2710.json
index 70e7a0985d..78907f0334 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2710.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2710.json
@@ -14,5 +14,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-2710",
   "sqKey": "S2710",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2711.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2711.json
index ffd59cb22e..b2689ca841 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2711.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2711.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-2711",
   "sqKey": "S2711",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2712.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2712.json
index 59736bb7f3..a67ec85493 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2712.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2712.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-2712",
   "sqKey": "S2712",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2733.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2733.json
index 63965e2bd1..1f01e2252c 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2733.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2733.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-2733",
   "sqKey": "S2733",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2734.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2734.json
index 1c641644cd..4608b011bd 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2734.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2734.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-2734",
   "sqKey": "S2734",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2737.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2737.json
index 6f13bb6397..e7523d8948 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2737.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2737.json
@@ -15,5 +15,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-2737",
   "sqKey": "S2737",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2755.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2755.html
index 8b05505e60..647b5cba4a 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2755.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2755.html
@@ -109,11 +109,12 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A4-XML_External_Entities_(XXE)">OWASP Top 10 2017 Category A4</a> - XML External Entities
   (XXE) </li>
   <li> <a href="https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html">OWASP XXE Prevention Cheat Sheet</a>
   </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/611.html">MITRE, CWE-611</a> - Information Exposure Through XML External Entity Reference </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/827.html">MITRE, CWE-827</a> - Improper Control of Document Type Definition </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/611.html">MITRE, CWE-611</a> - Information Exposure Through XML External Entity Reference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/827.html">MITRE, CWE-827</a> - Improper Control of Document Type Definition </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2755.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2755.json
index 1d0597c0a8..67863c5b7b 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2755.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2755.json
@@ -21,6 +21,10 @@
     ],
     "OWASP": [
       "A4"
+    ],
+    "OWASP Top 10 2021": [
+      "A5"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2757.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2757.json
index 0c755d53fb..8742db6cd4 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2757.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2757.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2757",
   "sqKey": "S2757",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2772.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2772.json
index a5d7c64674..9f9fd09971 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2772.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2772.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-2772",
   "sqKey": "S2772",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2823.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2823.json
index 59acf05880..dba266d22c 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2823.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2823.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-2823",
   "sqKey": "S2823",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2836.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2836.json
index b1d852b0b9..c374a7ddf1 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2836.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S2836.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2836",
   "sqKey": "S2836",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3329.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3329.html
index 6baa77c6d7..6f29d274fe 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3329.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3329.html
@@ -44,15 +44,16 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
   <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x08-v3-cryptography_verification_requirements">Mobile AppSec
   Verification Standard</a> - Cryptography Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">OWASP Mobile Top 10 2016 Category M5</a> -
   Insufficient Cryptography </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/329">MITRE, CWE-329</a> - CWE-329: Not Using an Unpredictable IV with CBC Mode </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/330">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/340">MITRE, CWE-340</a> - Generation of Predictable Numbers or Identifiers </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/329.html">MITRE, CWE-329</a> - Not Using an Unpredictable IV with CBC Mode </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/330.html">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/340.html">MITRE, CWE-340</a> - Generation of Predictable Numbers or Identifiers </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/1204.html">MITRE, CWE-1204</a> - Generation of Weak Initialization Vector (IV) </li>
   <li> <a href="https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38a.pdf">NIST, SP-800-38A</a> - Recommendation for Block Cipher
   Modes of Operation </li>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3329.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3329.json
index 3a7ad15337..d51ca028f7 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3329.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3329.json
@@ -1,5 +1,5 @@
 {
-  "title": "Cipher Block Chaining IV\u0027s should be unpredictable",
+  "title": "Cipher Block Chaining IVs should be unpredictable",
   "type": "VULNERABILITY",
   "status": "ready",
   "remediation": {
@@ -17,9 +17,10 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      330,
       329,
-      340
+      330,
+      340,
+      1204
     ],
     "OWASP": [
       "A6"
@@ -29,6 +30,10 @@
     ],
     "MASVS": [
       "MSTG-CRYPTO-6"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3330.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3330.html
index d393915f22..2b4e68f825 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3330.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3330.html
@@ -39,12 +39,11 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/HttpOnly">OWASP HttpOnly</a> </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A7-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site Scripting
   (XSS) </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/79.html">CWE-79</a> - Improper Neutralization of Input During Web Page Generation ('Cross-site
-  Scripting') </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/1004.html">CWE-1004</a> - Sensitive Cookie Without 'HttpOnly' Flag </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1004.html">MITRE, CWE-1004</a> - Sensitive Cookie Without 'HttpOnly' Flag </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
   <li> Derived from FindSecBugs rule <a href="https://find-sec-bugs.github.io/bugs.htm#HTTPONLY_COOKIE">HTTPONLY_COOKIE</a> </li>
 </ul>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3330.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3330.json
index 317f2b73cd..ba01c60ef5 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3330.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3330.json
@@ -18,11 +18,13 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      79,
       1004
     ],
     "OWASP": [
       "A7"
+    ],
+    "OWASP Top 10 2021": [
+      "A5"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3358.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3358.json
index c8a2783091..95119bf60a 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3358.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3358.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-3358",
   "sqKey": "S3358",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3403.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3403.json
index 9c856fb832..1581208372 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3403.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3403.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-3403",
   "sqKey": "S3403",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3457.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3457.json
index 923902a61c..ac250777bc 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3457.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3457.json
@@ -13,9 +13,5 @@
   "ruleSpecification": "RSPEC-3457",
   "sqKey": "S3457",
   "scope": "All",
-  "securityStandards": {
-    "CERT": [
-      "FIO47-C."
-    ]
-  }
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3516.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3516.json
index 82a370fae6..5d96ef6c25 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3516.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3516.json
@@ -11,5 +11,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-3516",
   "sqKey": "S3516",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3626.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3626.json
index d746c96e29..2b31b50337 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3626.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3626.json
@@ -13,5 +13,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-3626",
   "sqKey": "S3626",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3752.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3752.html
index e4be235a87..0b1ced7201 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3752.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3752.html
@@ -66,6 +66,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://owasp.org/www-project-top-ten/OWASP_Top_Ten_2017/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> -
   Broken Access Control </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/352.html">MITRE, CWE-352</a> - Cross-Site Request Forgery (CSRF) </li>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3752.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3752.json
index 217c78cea0..5a1df71608 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3752.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3752.json
@@ -21,6 +21,10 @@
     ],
     "OWASP": [
       "A5"
+    ],
+    "OWASP Top 10 2021": [
+      "A1",
+      "A4"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3776.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3776.json
index 6a53a67a06..d261115738 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3776.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3776.json
@@ -14,5 +14,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-3776",
   "sqKey": "S3776",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3827.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3827.json
index b40ea2947d..9fb2234397 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3827.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3827.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-3827",
   "sqKey": "S3827",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3862.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3862.json
index f999a7fd07..8d4e008f23 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3862.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3862.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-3862",
   "sqKey": "S3862",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3923.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3923.json
index 2d949d3bd3..3b9cfd0dd4 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3923.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3923.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-3923",
   "sqKey": "S3923",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3981.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3981.json
index 365d062160..94a2d2f43b 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3981.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3981.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-3981",
   "sqKey": "S3981",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3984.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3984.json
index b3fa2ae323..819cc584f5 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3984.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3984.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-3984",
   "sqKey": "S3984",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3985.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3985.json
index 8ce5cb6bdb..70b72d10d9 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3985.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S3985.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-3985",
   "sqKey": "S3985",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4143.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4143.json
index a4a0b92615..f3c3564308 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4143.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4143.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-4143",
   "sqKey": "S4143",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4144.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4144.json
index 5ae224aada..1343464c83 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4144.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4144.json
@@ -14,5 +14,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-4144",
   "sqKey": "S4144",
-  "scope": "All"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4423.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4423.html
index d28fc6072f..9d0da2aa57 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4423.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4423.html
@@ -30,6 +30,9 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4423.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4423.json
index 48a53bcfe7..3bf1564cdb 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4423.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4423.json
@@ -33,6 +33,11 @@
     ],
     "MASVS": [
       "MSTG-NETWORK-2"
+    ],
+    "OWASP Top 10 2021": [
+      "A2",
+      "A7"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4426.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4426.html
index 7f9c7f93c0..f57a09269a 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4426.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4426.html
@@ -31,6 +31,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4426.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4426.json
index 991a7fe51f..d50adead37 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4426.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4426.json
@@ -30,6 +30,10 @@
     ],
     "MASVS": [
       "MSTG-CRYPTO-3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4433.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4433.html
index 87aff0b7bf..7453e61ada 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4433.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4433.html
@@ -35,8 +35,10 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> - Broken Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/521.html">CWE-521</a> - Weak Password Requirements </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/521.html">MITRE, CWE-521</a> - Weak Password Requirements </li>
   <li> <a href="https://ldapwiki.com/wiki/Simple%20Authentication">ldapwiki.com</a>- Simple Authentication </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4433.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4433.json
index 2acec0a446..86a0cdc15e 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4433.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4433.json
@@ -20,6 +20,10 @@
     ],
     "OWASP": [
       "A2"
+    ],
+    "OWASP Top 10 2021": [
+      "A7"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4487.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4487.json
index b927f6aff0..cc4db43edf 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4487.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4487.json
@@ -17,10 +17,7 @@
   "securityStandards": {
     "CWE": [
       563
-    ],
-    "CERT": [
-      "MSC13-C.",
-      "MSC56-J."
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4502.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4502.html
index 9ae7dcb77f..1d9a50f038 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4502.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4502.html
@@ -138,6 +138,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/352.html">MITRE, CWE-352</a> - Cross-Site Request Forgery (CSRF) </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4502.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4502.json
index 17cad26999..89c0b31469 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4502.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4502.json
@@ -23,6 +23,9 @@
     ],
     "OWASP": [
       "A6"
+    ],
+    "OWASP Top 10 2021": [
+      "A1"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4507.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4507.html
index 66616cc2f6..2a0dc75796 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4507.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4507.html
@@ -8,12 +8,12 @@
 detailed information on both the system running the application and users.</p>
 <h2>Ask Yourself Whether</h2>
 <ul>
-  <li> the code or configuration enabling the application debug features is deployed on production servers. </li>
+  <li> the code or configuration enabling the application debug features is deployed on production servers or distributed to end users. </li>
   <li> the application runs by default with debug features activated. </li>
 </ul>
 <p>There is a risk if you answered yes to any of those questions.</p>
 <h2>Recommended Secure Coding Practices</h2>
-<p>Do not enable debug features on production servers.</p>
+<p>Do not enable debug features on production servers or applications distributed to end users.</p>
 <h2>Sensitive Code Example</h2>
 <p>Django</p>
 <pre>
@@ -35,9 +35,10 @@ <h2>Sensitive Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/489.html">MITRE, CWE-489</a> - Leftover Debug Code </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/215.html">MITRE, CWE-215</a> - Information Exposure Through Debug Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/489.html">MITRE, CWE-489</a> - Active Debug Code </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/215.html">MITRE, CWE-215</a> - Information Exposure Through Debug Information </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4507.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4507.json
index 7e55335f68..a348c2a11d 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4507.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4507.json
@@ -24,6 +24,9 @@
     ],
     "OWASP": [
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A5"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4721.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4721.html
index 203e83ffa3..dd976e85df 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4721.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4721.html
@@ -76,13 +76,12 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/78">MITRE, CWE-78</a> - Improper Neutralization of Special Elements used in an OS Command </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/78.html">MITRE, CWE-78</a> - Improper Neutralization of Special Elements used in an OS Command
+  </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
 </ul>
-
-<!-- Make sure to not drop this deprecation section when doing bulk update (as well as updating S4721.json and Sonar way)  -->
-<!-- This rule is deprecated only for Python language, that's why we can't deprecate in a standard way (through Jira RSPEC) -->
 <h2>Deprecated</h2>
 <p>This rule is deprecated, and will eventually be removed.</p>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4721.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4721.json
index b2e3902118..c318c66963 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4721.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4721.json
@@ -21,6 +21,10 @@
     ],
     "OWASP": [
       "A1"
+    ],
+    "OWASP Top 10 2021": [
+      "A3"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4784.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4784.html
index 8cddae2dd1..6c1a077c7c 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4784.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4784.html
@@ -89,5 +89,5 @@ <h2>See</h2>
   <li> OWASP Regular expression Denial of Service - ReDoS </li>
 </ul>
 <h2>Deprecated</h2>
-<p>This rule is deprecated; use {rule:python:S2631} instead.</p>
+<p>This rule is deprecated; use {rule:pythonsecurity:S2631} instead.</p>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4787.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4787.html
index 514b7c7945..800865679d 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4787.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4787.html
@@ -91,13 +91,13 @@ <h2>See</h2>
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/321.html">MITRE, CWE-321</a> - Use of Hard-coded Cryptographic Key </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/322.html">MITRE, CWE-322</a> - Key Exchange without Entity Authentication </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/323.html">MITRE, CWE-323</a> - Reusing a Nonce, Key Pair in Encryption </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/324.html">MITRE, CWE-324</a> - Use of a Key Past its Expiration Date </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/325.html">MITRE, CWE-325</a> - Missing Required Cryptographic Step </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/321.html">MITRE, CWE-321</a> - Use of Hard-coded Cryptographic Key </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/322.html">MITRE, CWE-322</a> - Key Exchange without Entity Authentication </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/323.html">MITRE, CWE-323</a> - Reusing a Nonce, Key Pair in Encryption </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/324.html">MITRE, CWE-324</a> - Use of a Key Past its Expiration Date </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/325.html">MITRE, CWE-325</a> - Missing Required Cryptographic Step </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4790.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4790.html
index ba5f3c96eb..2129b6ad12 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4790.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4790.html
@@ -37,6 +37,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
@@ -45,9 +46,7 @@ <h2>See</h2>
   Verification Standard</a> - Cryptography Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">OWASP Mobile Top 10 2016 Category M5</a> -
   Insufficient Cryptography </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/916.html">MITRE, CWE-916</a> - Use of Password Hash With Insufficient Computational Effort
-  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1240.html">MITRE, CWE-1240</a> - Use of a Risky Cryptographic Primitive </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4790.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4790.json
index b02911d4df..0296709d8c 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4790.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4790.json
@@ -16,9 +16,7 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      916,
-      327,
-      328
+      1240
     ],
     "OWASP": [
       "A3",
@@ -29,6 +27,9 @@
     ],
     "MASVS": [
       "MSTG-CRYPTO-4"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4792.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4792.html
index 1a1550d6b0..38573c5d7b 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4792.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4792.html
@@ -88,13 +88,14 @@ <h2>Sensitive Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A09_2021-Security_Logging_and_Monitoring_Failures/">OWASP Top 10 2021 Category A9</a> - Security Logging and
+  Monitoring Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A10_2017-Insufficient_Logging%2526Monitoring">OWASP Top 10 2017 Category A10</a> -
   Insufficient Logging &amp; Monitoring </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/532.html">MITRE, CWE-532</a> - Information Exposure Through Log Files </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/117.html">MITRE, CWE-117</a> - Improper Output Neutralization for Logs </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/778.html">MITRE, CWE-778</a> - Insufficient Logging </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/532.html">MITRE, CWE-532</a> - Information Exposure Through Log Files </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4792.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4792.json
index ff1f3f3c85..d3d97d2d61 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4792.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4792.json
@@ -14,13 +14,15 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      532,
       117,
-      778
+      532
     ],
     "OWASP": [
       "A3",
       "A10"
+    ],
+    "OWASP Top 10 2021": [
+      "A9"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4830.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4830.html
index 559d865e93..cb551947a5 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4830.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4830.html
@@ -63,6 +63,10 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4830.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4830.json
index efbc713b73..5aa41d9006 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4830.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S4830.json
@@ -32,8 +32,11 @@
     "MASVS": [
       "MSTG-NETWORK-3"
     ],
-    "CERT": [
-      "MSC61-J."
+    "OWASP Top 10 2021": [
+      "A2",
+      "A5",
+      "A7"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5042.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5042.html
index b6179d230a..66bbdcf346 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5042.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5042.html
@@ -1,7 +1,7 @@
 <p>Successful Zip Bomb attacks occur when an application expands untrusted archive files without controlling the size of the expanded data, which can
 lead to denial of service. A Zip bomb is usually a malicious archive file of a few kilobytes of compressed data but turned into gigabytes of
 uncompressed data. To achieve this extreme <a href="https://en.wikipedia.org/wiki/Data_compression_ratio">compression ratio</a>, attackers will
-compress irrelevant data (eg: a long string of repeated bytes). </p>
+compress irrelevant data (eg: a long string of repeated bytes).</p>
 <h2>Ask Yourself Whether</h2>
 <p>Archives to expand are untrusted and:</p>
 <ul>
@@ -16,25 +16,111 @@ <h2>Recommended Secure Coding Practices</h2>
   1 to 3. </li>
   <li> Define and control the threshold for maximum total size of the uncompressed data. </li>
   <li> Count the number of file entries extracted from the archive and abort the extraction if their number is greater than a predefined threshold, in
-  particular it's not recommended to recursively expand archives (an entry of an archive could be also an archive). </li>
+  particular it’s not recommended to recursively expand archives (an entry of an archive could be also an archive). </li>
 </ul>
 <h2>Sensitive Code Example</h2>
 <p>For <a href="https://docs.python.org/3.5/library/tarfile.html">tarfile</a> module:</p>
 <pre>
 import tarfile
 
-tar = tarfile.open("attachment.tar.gz")  # Sensitive
-tar.extractall()
-tar.close()
+tfile = tarfile.open("TarBomb.tar")
+tfile.extractall('./tmp/')  # Sensitive
+tfile.close()
+</pre>
+<p>For <a href="https://docs.python.org/dev/library/zipfile.html">zipfile</a> module:</p>
+<pre>
+import zipfile
+
+zfile = zipfile.ZipFile('ZipBomb.zip', 'r')
+zfile.extractall('./tmp/') # Sensitive
+zfile.close()
+</pre>
+<h2>Compliant Solution</h2>
+<p>For <a href="https://docs.python.org/3.5/library/tarfile.html">tarfile</a> module:</p>
+<pre>
+import tarfile
+
+THRESHOLD_ENTRIES = 10000
+THRESHOLD_SIZE = 1000000000
+THRESHOLD_RATIO = 10
+
+totalSizeArchive = 0;
+totalEntryArchive = 0;
+
+tfile = tarfile.open("TarBomb.tar")
+for entry in tfile:
+  tarinfo = tfile.extractfile(entry)
+
+  totalEntryArchive += 1
+  sizeEntry = 0
+  result = b''
+  while True:
+    sizeEntry += 1024
+    totalSizeArchive += 1024
+
+    ratio = sizeEntry / entry.size
+    if ratio &gt; THRESHOLD_RATIO:
+      # ratio between compressed and uncompressed data is highly suspicious, looks like a Zip Bomb Attack
+      break
+
+    chunk = tarinfo.read(1024)
+    if not chunk:
+      break
+
+    result += chunk
+
+  if totalEntryArchive &gt; THRESHOLD_ENTRIES:
+    # too much entries in this archive, can lead to inodes exhaustion of the system
+    break
+
+  if totalSizeArchive &gt; THRESHOLD_SIZE:
+    # the uncompressed data size is too much for the application resource capacity
+    break
+
+tfile.close()
+</pre>
+<p>For <a href="https://docs.python.org/dev/library/zipfile.html">zipfile</a> module:</p>
+<pre>
+import zipfile
+
+THRESHOLD_ENTRIES = 10000
+THRESHOLD_SIZE = 1000000000
+THRESHOLD_RATIO = 10
+
+totalSizeArchive = 0;
+totalEntryArchive = 0;
+
+zfile = zipfile.ZipFile('ZipBomb.zip', 'r')
+for zinfo in zfile.infolist():
+    print('File', zinfo.filename)
+    data = zfile.read(zinfo)
+
+    totalEntryArchive += 1
+
+    totalSizeArchive = totalSizeArchive + len(data)
+    ratio = len(data) / zinfo.compress_size
+    if ratio &gt; THRESHOLD_RATIO:
+      # ratio between compressed and uncompressed data is highly suspicious, looks like a Zip Bomb Attack
+      break
+
+    if totalSizeArchive &gt; THRESHOLD_SIZE:
+      # the uncompressed data size is too much for the application resource capacity
+      break
+
+    if totalEntryArchive &gt; THRESHOLD_ENTRIES:
+      # too much entries in this archive, can lead to inodes exhaustion of the system
+      break
+
+zfile.close()
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://owasp.org/www-project-top-ten/OWASP_Top_Ten_2017/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> -
   Security Misconfiguration </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/409.html">MITRE, CWE-409</a> - Improper Handling of Highly Compressed Data (Data Amplification)
   </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/display/java/IDS04-J.+Safely+extract+files+from+ZipInputStream">CERT, IDS04-J.</a> - Safely
-  extract files from ZipInputStream </li>
   <li> <a href="https://www.bamsoftware.com/hacks/zipbomb/">bamsoftware.com</a> - A better Zip Bomb </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5042.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5042.json
index 95bbdd6638..5de2ad45f0 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5042.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5042.json
@@ -23,8 +23,9 @@
       "A5",
       "A6"
     ],
-    "CERT": [
-      "IDS04-J."
+    "OWASP Top 10 2021": [
+      "A1",
+      "A5"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5122.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5122.html
index d2043bbef0..c19793edf1 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5122.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5122.html
@@ -50,6 +50,9 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS">developer.mozilla.org</a> - CORS </li>
   <li> <a href="https://developer.mozilla.org/en-US/docs/Web/Security/Same-origin_policy">developer.mozilla.org</a> - Same origin policy </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5122.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5122.json
index 46c46427a5..d58157c7f8 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5122.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5122.json
@@ -18,6 +18,10 @@
     ],
     "OWASP": [
       "A6"
+    ],
+    "OWASP Top 10 2021": [
+      "A5",
+      "A7"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5247.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5247.html
index 427110c002..646a7055e5 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5247.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5247.html
@@ -36,16 +36,12 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
   <li> <a href="https://github.com/OWASP/CheatSheetSeries/blob/master/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.md">OWASP Cheat
   Sheet</a> - XSS Prevention Cheat Sheet </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A7-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site Scripting
   (XSS) </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/79.html">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
   ('Cross-site Scripting') </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/80.html">MITRE, CWE-80</a> - Improper Neutralization of Script-Related HTML Tags in a Web Page
-  (Basic XSS) </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/83.html">MITRE, CWE-83</a> - Improper Neutralization of Script in Attributes in a Web Page
-  </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/84.html">MITRE, CWE-84</a> - Improper Neutralization of Encoded URI Schemes in a Web Page </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5247.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5247.json
index 273e02c51d..a66a02b4f7 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5247.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5247.json
@@ -16,18 +16,13 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      79,
-      80,
-      81,
-      82,
-      83,
-      84,
-      85,
-      86,
-      87
+      79
     ],
     "OWASP": [
       "A7"
+    ],
+    "OWASP Top 10 2021": [
+      "A3"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5332.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5332.html
index f6662fe86b..6f280d94e2 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5332.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5332.html
@@ -1,6 +1,6 @@
-<p>Clear-text protocols as <code>ftp</code>, <code>telnet</code> or non secure <code>http</code> are lacking encryption of transported data. They are
-also missing the capability to build an authenticated connection. This mean that any attacker who can sniff traffic from the network can read, modify
-or corrupt the transported content. These protocol are not secure as they expose applications to a large range of risk:</p>
+<p>Clear-text protocols such as <code>ftp</code>, <code>telnet</code> or non-secure <code>http</code> lack encryption of transported data, as well as
+the capability to build an authenticated connection. It means that an attacker able to sniff traffic from the network can read, modify or corrupt the
+transported content. These protocols are not secure as they expose applications to an extensive range of risks:</p>
 <ul>
   <li> Sensitive data exposure </li>
   <li> Traffic redirected to a malicious endpoint </li>
@@ -8,8 +8,19 @@
   <li> Execution of client side code </li>
   <li> Corruption of critical information </li>
 </ul>
-<p>Note also that using the <code>http</code> protocol is being deprecated by <a
-href="https://blog.mozilla.org/security/2015/04/30/deprecating-non-secure-http">major web browser</a>.</p>
+<p>Even in the context of isolated networks like offline environments or segmented cloud environments, the insider threat exists. Thus, attacks
+involving communications being sniffed or tampered with can still happen.</p>
+<p>For example, attackers could successfully compromise prior security layers by:</p>
+<ul>
+  <li> Bypassing isolation mechanisms </li>
+  <li> Compromising a component of the network </li>
+  <li> Getting the credentials of an internal IAM account (either from a service account or an actual person) </li>
+</ul>
+<p>In such cases, encrypting communications would decrease the chances of attackers to successfully leak data or steal credentials from other network
+components. By layering various security practices (segmentation and encryption, for example), the application will follow the
+<em>defense-in-depth</em> principle.</p>
+<p>Note that using the <code>http</code> protocol is being deprecated by <a
+href="https://blog.mozilla.org/security/2015/04/30/deprecating-non-secure-http">major web browsers</a>.</p>
 <p>In the past, it has led to the following vulnerabilities:</p>
 <ul>
   <li> <a href="https://nvd.nist.gov/vuln/detail/CVE-2019-6169">CVE-2019-6169</a> </li>
@@ -18,18 +29,28 @@
 </ul>
 <h2>Ask Yourself Whether</h2>
 <ul>
-  <li> The confidentiality and integrity of data is necessary in the context of the web application. </li>
-  <li> The data is exchanged on an exposed network (Internet, public network etc). </li>
+  <li> Application data needs to be protected against falsifications or leaks when transiting over the network. </li>
+  <li> Application data transits over a network that is considered untrusted. </li>
+  <li> Compliance rules require the service to encrypt data in transit. </li>
+  <li> Your application renders web pages with a relaxed mixed content policy. </li>
+  <li> OS level protections against clear-text traffic are deactivated. </li>
 </ul>
 <p>There is a risk if you answered yes to any of those questions.</p>
 <h2>Recommended Secure Coding Practices</h2>
 <ul>
-  <li> Use <code>ssh</code> as an alternative to <code>telnet</code> </li>
-  <li> Use <code>sftp</code>, <code>scp</code> or <code>ftps</code> instead of <code>ftp</code> </li>
-  <li> Use <code>https</code> instead of <code>http</code> </li>
-  <li> Use <code>SMTP</code> over <code>SSL/TLS</code> or <code>SMTP</code> with <code>STARTTLS</code> instead of clear-text SMTP </li>
+  <li> Make application data transit over a secure, authenticated and encrypted protocol like TLS or SSH. Here are a few alternatives to the most
+  common clear-text protocols:
+    <ul>
+      <li> Use<code>ssh</code> as an alternative to <code>telnet</code> </li>
+      <li> Use <code>sftp</code>, <code>scp</code> or <code>ftps</code> instead of <code>ftp</code> </li>
+      <li> Use <code>https</code> instead of <code>http</code> </li>
+      <li> Use <code>SMTP</code> over <code>SSL/TLS</code> or <code>SMTP</code> with <code>STARTTLS</code> instead of clear-text SMTP </li>
+    </ul>  </li>
+  <li> Enable encryption of cloud components communications whenever it’s possible. </li>
+  <li> Configure your application to block mixed content when rendering web pages. </li>
+  <li> If available, enforce OS level deativation of all clear-text traffic </li>
 </ul>
-<p>It is recommended to secure all transport channels (event local network) as it can take a single non secure connection to compromise an entire
+<p>It is recommended to secure all transport channels (even local network) as it can take a single non secure connection to compromise an entire
 application or system.</p>
 <h2>Sensitive Code Example</h2>
 <pre>
@@ -68,6 +89,7 @@ <h2>Exceptions</h2>
 </ul>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x10-v5-network_communication_requirements">Mobile AppSec Verification
@@ -75,7 +97,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">OWASP Mobile Top 10 2016 Category M3</a> - Insecure
   Communication </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/200.html">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/319">MITRE, CWE-319</a> - Cleartext Transmission of Sensitive Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/319.html">MITRE, CWE-319</a> - Cleartext Transmission of Sensitive Information </li>
   <li> <a href="https://security.googleblog.com/2016/09/moving-towards-more-secure-web.html">Google, Moving towards more secure web</a> </li>
   <li> <a href="https://blog.mozilla.org/security/2015/04/30/deprecating-non-secure-http/">Mozilla, Deprecating non secure http</a> </li>
 </ul>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5332.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5332.json
index 52063608be..be0360d878 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5332.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5332.json
@@ -24,6 +24,9 @@
     ],
     "MASVS": [
       "MSTG-NETWORK-1"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5439.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5439.json
index dfdb513861..a6af17e954 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5439.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5439.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5439",
   "sqKey": "S5439",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5443.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5443.html
index b47d84e5d4..7286514bfd 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5443.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5443.html
@@ -58,12 +58,13 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/377">MITRE, CWE-377</a> - Insecure Temporary File </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/379">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect Permissions
-  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/377.html">MITRE, CWE-377</a> - Insecure Temporary File </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/379.html">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect
+  Permissions </li>
   <li> <a href="https://www.owasp.org/index.php/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
   <li> <a href="https://docs.python.org/3/library/tempfile.html">Python tempfile module</a> </li>
 </ul>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5443.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5443.json
index 053403e7cd..392f0b50c7 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5443.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5443.json
@@ -19,6 +19,9 @@
     "OWASP": [
       "A5",
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A1"
     ]
   }
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5445.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5445.html
index a7c096e666..7936156510 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5445.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5445.html
@@ -22,11 +22,12 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A9-Using_Components_with_Known_Vulnerabilities">OWASP Top 10 2017 Category A9</a> - Using
   Components with Known Vulnerabilities </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/377">MITRE, CWE-377</a> - Insecure Temporary File </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/379">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect Permissions
-  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/377.html">MITRE, CWE-377</a> - Insecure Temporary File </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/379.html">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect
+  Permissions </li>
   <li> <a href="https://www.owasp.org/index.php/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
   <li> <a href="https://docs.python.org/3/library/tempfile.html#deprecated-functions-and-variables">Python tempfile module</a> </li>
   <li> <a href="https://docs.python.org/2.7/library/os.html">Python 2.7 os module</a> </li>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5445.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5445.json
index b3761edfe8..962d8d9718 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5445.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5445.json
@@ -21,6 +21,10 @@
     ],
     "OWASP": [
       "A9"
+    ],
+    "OWASP Top 10 2021": [
+      "A1"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5527.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5527.html
index 004a1f1a61..e535e3d5d6 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5527.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5527.html
@@ -33,6 +33,10 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5527.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5527.json
index 408b8922ca..205de58e3b 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5527.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5527.json
@@ -20,8 +20,7 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      297,
-      295
+      297
     ],
     "OWASP": [
       "A3",
@@ -32,6 +31,12 @@
     ],
     "MASVS": [
       "MSTG-NETWORK-3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2",
+      "A5",
+      "A7"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5542.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5542.html
index 5ec29ab7dc..27a7ebca50 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5542.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5542.html
@@ -117,6 +117,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5542.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5542.json
index e6da37e4cc..11712f52f4 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5542.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5542.json
@@ -33,8 +33,9 @@
     "MASVS": [
       "MSTG-CRYPTO-3"
     ],
-    "CERT": [
-      "MSC61-J."
+    "OWASP Top 10 2021": [
+      "A2"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5547.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5547.html
index a24c129bd4..3d136c4fd7 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5547.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5547.html
@@ -110,6 +110,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5547.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5547.json
index 6f65651a9c..b946096e20 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5547.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5547.json
@@ -33,8 +33,9 @@
     "MASVS": [
       "MSTG-CRYPTO-3"
     ],
-    "CERT": [
-      "MSC61-J."
+    "OWASP Top 10 2021": [
+      "A2"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5549.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5549.json
index b221e94691..0f9015df84 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5549.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5549.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5549",
   "sqKey": "S5549",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5603.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5603.json
index b848fd8c01..8c670eeab4 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5603.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5603.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5603",
   "sqKey": "S5603",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5607.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5607.json
index cb3fc11d38..fa9264c3c6 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5607.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5607.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5607",
   "sqKey": "S5607",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5632.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5632.json
index 4fda024063..2d0c5556a3 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5632.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5632.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5632",
   "sqKey": "S5632",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5644.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5644.json
index 2ec27388b4..4b26617b66 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5644.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5644.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5644",
   "sqKey": "S5644",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5655.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5655.json
index b7a73f2203..94bbb3496d 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5655.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5655.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5655",
   "sqKey": "S5655",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5659.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5659.html
index 09185baf39..534d452f58 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5659.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5659.html
@@ -26,6 +26,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/347.html">MITRE, CWE-347</a> - Improper Verification of Cryptographic Signature </li>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5659.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5659.json
index 0fa25ecc3e..29504c9355 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5659.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5659.json
@@ -21,6 +21,10 @@
     ],
     "OWASP": [
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5685.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5685.json
index 286374a7ae..627d474ab1 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5685.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5685.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-5685",
   "sqKey": "S5685",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5704.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5704.json
index ef46104580..8c24f75a49 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5704.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5704.json
@@ -14,5 +14,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5704",
   "sqKey": "S5704",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5706.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5706.json
index bfea51b0bd..c0715d6ec4 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5706.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5706.json
@@ -13,5 +13,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5706",
   "sqKey": "S5706",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5707.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5707.json
index ac21a8ead4..2e8addd78f 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5707.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5707.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5707",
   "sqKey": "S5707",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5708.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5708.json
index 6799eddf4e..dc5d141f89 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5708.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5708.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5708",
   "sqKey": "S5708",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5709.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5709.json
index 392aa6e2c3..f783912204 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5709.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5709.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5709",
   "sqKey": "S5709",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5712.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5712.json
index 980438ab2f..5c8390e2a0 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5712.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5712.json
@@ -13,5 +13,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5712",
   "sqKey": "S5712",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5713.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5713.json
index 8124f665ec..c3593b8e3d 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5713.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5713.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-5713",
   "sqKey": "S5713",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5714.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5714.json
index 014385dd6a..4d3ff45eb9 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5714.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5714.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5714",
   "sqKey": "S5714",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5717.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5717.json
index 380a3f4a9b..0aa86f9a0b 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5717.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5717.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5717",
   "sqKey": "S5717",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5719.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5719.json
index 7fe9184e2d..1bb33a7f90 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5719.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5719.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5719",
   "sqKey": "S5719",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5720.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5720.json
index a94aed435e..7e4f6c7b4b 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5720.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5720.json
@@ -14,5 +14,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5720",
   "sqKey": "S5720",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5722.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5722.json
index 1c774a76cb..2c16f8dcda 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5722.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5722.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5722",
   "sqKey": "S5722",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5724.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5724.json
index 98eb812687..8dddac2687 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5724.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5724.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5724",
   "sqKey": "S5724",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5727.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5727.json
index 1754ef8beb..1422948149 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5727.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5727.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5727",
   "sqKey": "S5727",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5747.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5747.json
index c09834a00f..4c40ed3a7b 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5747.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5747.json
@@ -14,5 +14,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5747",
   "sqKey": "S5747",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5754.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5754.html
index 91ce67a4e1..5bebc0894f 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5754.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5754.html
@@ -59,6 +59,6 @@ <h2>See</h2>
   <li> Python Documentation - <a href="https://docs.python.org/3/library/exceptions.html">Built-in exceptions</a> </li>
   <li> Python Documentation - <a href="https://docs.python.org/3/reference/compound_stmts.html#the-try-statement">The <code>try</code> statement</a>
   </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/391.html">MITRE, CWE-391</a> - Unchecked Error Condition </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/391.html">MITRE, CWE-391</a> - Unchecked Error Condition </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5754.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5754.json
index b354efd532..507d96457a 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5754.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5754.json
@@ -14,5 +14,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5754",
   "sqKey": "S5754",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5756.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5756.json
index c07da74fc1..7b317c9139 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5756.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5756.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5756",
   "sqKey": "S5756",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5780.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5780.json
index 8b443790b9..c441ef7b33 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5780.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5780.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5780",
   "sqKey": "S5780",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5781.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5781.json
index 62e5f2d025..fedc5d80e0 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5781.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5781.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5781",
   "sqKey": "S5781",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5795.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5795.json
index c518120302..c0a870d253 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5795.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5795.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5795",
   "sqKey": "S5795",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5796.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5796.json
index 01abcd511b..7f7a7476b3 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5796.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5796.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5796",
   "sqKey": "S5796",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5797.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5797.json
index 2517c98fd0..a5b188a77c 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5797.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5797.json
@@ -12,5 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5797",
   "sqKey": "S5797",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5799.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5799.json
index 46b91049f1..bc74dcde73 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5799.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5799.json
@@ -13,5 +13,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5799",
   "sqKey": "S5799",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5806.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5806.json
index 09550db17f..9678a9c2e0 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5806.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5806.json
@@ -14,5 +14,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5806",
   "sqKey": "S5806",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5807.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5807.json
index 03cd51e588..d2bc5cb38b 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5807.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5807.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5807",
   "sqKey": "S5807",
-  "scope": "Main"
+  "scope": "Main",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5828.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5828.json
index 3f824245dc..88e12fe230 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5828.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5828.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5828",
   "sqKey": "S5828",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5843.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5843.html
index c7556dd555..d220ba9fe3 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5843.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5843.html
@@ -3,6 +3,43 @@
 <p>The complexity of a regular expression is determined as follows:</p>
 <p>Each of the following operators increases the complexity by an amount equal to the current nesting level and also increases the current nesting
 level by one for its arguments:</p>
+<ul>
+  <li> <code>|</code> - when multiple <code>|</code> operators are used together, the subsequent ones only increase the complexity by 1 </li>
+  <li> <code>&amp;&amp;</code> (inside character classes) - when multiple <code>&amp;&amp;</code> operators are used together, the subsequent ones
+  only increase the complexity by 1 </li>
+  <li> Quantifiers (<code>*</code>, <code>+</code>, <code>?</code>, <code>{n,m}</code>, <code>{n,}</code> or <code>{n}</code>) </li>
+  <li> Non-capturing groups that set flags (such as <code>(?i:some_pattern)</code> or <code>(?i)some_pattern</code>) </li>
+  <li> Lookahead and lookbehind assertions </li>
+</ul>
+<p>Additionally, each use of the following features increase the complexity by 1 regardless of nesting:</p>
+<ul>
+  <li> character classes </li>
+  <li> back references </li>
+</ul>
+<p>If a regular expression is split among multiple variables, the complexity is calculated for each variable individually, not for the whole regular
+expression. If a regular expression is split over multiple lines, each line is treated individually if it is accompanied by a comment (either a Java
+comment or a comment within the regular expression), otherwise the regular expression is analyzed as a whole.</p>
+<h2>Noncompliant Code Example</h2>
+<pre>
+if (dateString.matches("^(?:(?:31(\\/|-|\\.)(?:0?[13578]|1[02]))\\1|(?:(?:29|30)(\\/|-|\\.)(?:0?[13-9]|1[0-2])\\2))(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$|^(?:29(\\/|-|\\.)0?2\\3(?:(?:(?:1[6-9]|[2-9]\\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00))))$|^(?:0?[1-9]|1\\d|2[0-8])(\\/|-|\\.)(?:(?:0?[1-9])|(?:1[0-2]))\\4(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$")) {
+    handleDate(dateString);
+}
+</pre>
+<h2>Compliant Solution</h2>
+<pre>
+if (dateString.matches("^\\d{1,2}([-/.])\\d{1,2}\\1\\d{1,4}$")) {
+    String dateParts[] = dateString.split("[-/.]");
+    int day = Integer.parseInt(dateParts[0]);
+    int month = Integer.parseInt(dateParts[1]);
+    int year = Integer.parseInt(dateParts[2]);
+    // Put logic to validate and process the date based on its integer parts here
+}
+</pre>
+<h2>Exceptions</h2>
+<p>Regular expressions are only analyzed if all parts of the regular expression are either string literals, effectively final local variables or
+<code>static final</code> fields, all of which can be combined using the '<code>+</code>' operator.</p>
+<p>When a regular expression is split among multiple variables or commented lines, each part is only analyzed if it is syntactically valid by
+itself.</p>
 <ul>
   <li> <code>|</code> - when multiple <code>|</code> operators are used together, the subsequent ones only increase the complexity by 1 </li>
   <li> Quantifiers (<code>*</code>, <code>+</code>, <code>?</code>, <code>{n,m}</code>, <code>{n,}</code> or <code>{n}</code>) </li>
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5864.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5864.json
index b7f438b158..a8871db1e5 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5864.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5864.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5864",
   "sqKey": "S5864",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5868.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5868.html
index a12240a31a..c437bb9bec 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5868.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5868.html
@@ -8,10 +8,10 @@
 <p>This rule raises an issue every time Unicode Grapheme Clusters are used within a character class of a regular expression.</p>
 <h2>Noncompliant Code Example</h2>
 <pre>
-re.sub(r"[c̈d̈]", "X", "cc̈d̈d"); # Noncompliant, print "XXXXXX" instead of expected "cXXd".
+re.sub(r"[c̈d̈]", "X", "cc̈d̈d") # Noncompliant, print "XXXXXX" instead of expected "cXXd".
 </pre>
 <h2>Compliant Solution</h2>
 <pre>
-re.sub(r"c̈|d̈", "X", "cc̈d̈d"); # print "cXXd"
+re.sub(r"c̈|d̈", "X", "cc̈d̈d") # print "cXXd"
 </pre>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5886.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5886.json
index c67351cc0e..1aa7ebec89 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5886.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5886.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5886",
   "sqKey": "S5886",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5890.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5890.json
index aecd0e2af6..928f100bcc 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5890.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5890.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5890",
   "sqKey": "S5890",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5953.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5953.json
index 490b573f79..2b1654b635 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5953.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S5953.json
@@ -10,5 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-5953",
   "sqKey": "S5953",
-  "scope": "All"
+  "scope": "All",
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S6035.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S6035.html
index 74ed9735e3..ba75381b4b 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S6035.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S6035.html
@@ -1,5 +1,5 @@
 <p>When an alternation contains multiple alternatives that consist of a single character, it can be rewritten as a character class. This should be
-preferred because it is more efficient and can even help prevent stack overflows when used inside a repetition (see rule {rule:python:S5998}).</p>
+preferred because it is more efficient.</p>
 <h2>Noncompliant Code Example</h2>
 <pre>
 r"a|b|c" # Noncompliant
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S905.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S905.html
index a590e1b1e7..83cd957c12 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S905.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S905.html
@@ -27,6 +27,6 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/482">MITRE, CWE-482</a> - Comparing instead of Assigning </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/482.html">MITRE, CWE-482</a> - Comparing instead of Assigning </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S905.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S905.json
index 03c33d27d7..4361f69320 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S905.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S905.json
@@ -18,5 +18,6 @@
     "CWE": [
       482
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S930.html b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S930.html
index 41c706e740..5c0334a52a 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S930.html
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S930.html
@@ -55,10 +55,6 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> MISRA C:2004, 16.6 - The number of arguments passed to a function shall match the number of parameters. </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/628.html">MITRE, CWE-628</a> - Function Call with Incorrectly Specified Arguments </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/7NYxBQ">CERT, DCL07-C.</a> - Include the appropriate type information in function declarators
-  </li>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/49UxBQ">CERT, EXP37-C.</a> - Call functions with the correct number and type of arguments </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/628.html">MITRE, CWE-628</a> - Function Call with Incorrectly Specified Arguments </li>
 </ul>
 
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S930.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S930.json
index 8f59ee03f0..be44c1c0b7 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S930.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/S930.json
@@ -16,10 +16,7 @@
   "securityStandards": {
     "CWE": [
       628
-    ],
-    "CERT": [
-      "EXP37-C.",
-      "DCL07-C."
     ]
-  }
+  },
+  "quickfix": "unknown"
 }
diff --git a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/Sonar_way_profile.json b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/Sonar_way_profile.json
index 9c76004bfe..006159b5ed 100644
--- a/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/Sonar_way_profile.json
+++ b/python-checks/src/main/resources/org/sonar/l10n/py/rules/python/Sonar_way_profile.json
@@ -28,6 +28,7 @@
     "S1313",
     "S1481",
     "S1515",
+    "S1523",
     "S1542",
     "S1656",
     "S1700",
@@ -85,6 +86,7 @@
     "S4487",
     "S4502",
     "S4507",
+    "S4721",
     "S4790",
     "S4792",
     "S4828",
diff --git a/sonarpedia.json b/sonarpedia.json
index 6512f0cc90..501c29bdfa 100644
--- a/sonarpedia.json
+++ b/sonarpedia.json
@@ -3,7 +3,7 @@
   "languages": [
     "PY"
   ],
-  "latest-update": "2021-07-22T09:08:00.264Z",
+  "latest-update": "2021-11-05T10:28:56.781413Z",
   "options": {
     "no-language-in-filenames": true,
     "preserve-filenames": true