diff --git a/framework b/framework
index a39ba59344fd..dfe459c0ab95 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit a39ba59344fd4f1d0ee267ca414b9420d5dca9f5
+Subproject commit dfe459c0ab956af70ab83fc8ae9c4a67f2cdfe00
diff --git a/scripts/config.py b/scripts/config.py
index c266d8943f2c..543d18686096 100755
--- a/scripts/config.py
+++ b/scripts/config.py
@@ -367,7 +367,7 @@ def custom_parser_options(self):
         self.parser.add_argument(
             '--cryptofile', '-c',
             help="""Crypto file to read (and modify if requested). Default: {}."""
-            .format(CryptoConfigFile.default_path))
+            .format(str(CryptoConfigFile.default_path).replace('%', '%%')))
 
         self.add_adapter(
             'baremetal', baremetal_adapter,
diff --git a/tests/scripts/psa_collect_statuses.py b/tests/scripts/psa_collect_statuses.py
index 11bbebcc1f00..f280119d709a 100755
--- a/tests/scripts/psa_collect_statuses.py
+++ b/tests/scripts/psa_collect_statuses.py
@@ -109,14 +109,10 @@ def main():
                         help='Run "make clean" before regenerating the log file)')
     parser.add_argument('--log-file', metavar='FILE',
                         default=DEFAULT_STATUS_LOG_FILE,
-                        help='Log file location (default: {})'.format(
-                            DEFAULT_STATUS_LOG_FILE
-                        ))
+                        help='Log file location (default: %(default)s)')
     parser.add_argument('--psa-constant-names', metavar='PROGRAM',
                         default=DEFAULT_PSA_CONSTANT_NAMES,
-                        help='Path to psa_constant_names (default: {})'.format(
-                            DEFAULT_PSA_CONSTANT_NAMES
-                        ))
+                        help='Path to psa_constant_names (default: %(default)s)')
     parser.add_argument('--use-existing-log', '-e',
                         action='store_true',
                         help='Don\'t regenerate the log file if it exists')