diff --git a/NEWS.rst b/NEWS.rst
index 0a13a4032a9cf6d617c4c113155e395824fcfe4e_TkVXUy5yc3Q=..6737d378635ecfcb4d9fb2dcb42708a421fd2bfc_TkVXUy5yc3Q= 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -13,6 +13,8 @@
 
 Detect import errors in run_tests.
 
+Add option to disable PYTHONDEVMODE.
+
 16.6.0
 ------
 
diff --git a/odoo_scripts/docker_dev_start.py b/odoo_scripts/docker_dev_start.py
index 0a13a4032a9cf6d617c4c113155e395824fcfe4e_b2Rvb19zY3JpcHRzL2RvY2tlcl9kZXZfc3RhcnQucHk=..6737d378635ecfcb4d9fb2dcb42708a421fd2bfc_b2Rvb19zY3JpcHRzL2RvY2tlcl9kZXZfc3RhcnQucHk= 100755
--- a/odoo_scripts/docker_dev_start.py
+++ b/odoo_scripts/docker_dev_start.py
@@ -42,5 +42,5 @@
 
 _logger = logging.getLogger(__name__)
 
-__version__ = "3.5.0"
+__version__ = "3.6.0"
 __date__ = "2017-08-11"
@@ -46,5 +46,5 @@
 __date__ = "2017-08-11"
-__updated__ = "2022-08-11"
+__updated__ = "2022-08-25"
 
 
 def __parser(project_name: str) -> ArgumentParser:
@@ -363,6 +363,13 @@
         help="marabunta force version argument (see marabunta documentation)",
     )
 
+    parser.add_argument(
+        "--no-pythondevmode",
+        help="Do not set PYTHONDEVMODE",
+        action="store_false",
+        default=True,
+        dest="python_dev_mode",
+    )
     return parser
 
 
@@ -426,6 +433,7 @@
     marabunta_db_user = nmspc.marabunta_db_user
     marabunta_db_password = nmspc.marabunta_db_password
     marabunta_force_version = nmspc.marabunta_force_version
+    python_dev_mode = nmspc.python_dev_mode
 
     if restore_filename:
         if not database:
@@ -1063,7 +1071,8 @@
             arg.append(f"--dev={','.join(set(dev_opts))}")
         if odoo_type in (ODOO_8,):
             arg.append("--auto-reload")
-        options["environment"]["PYTHONDEVMODE"] = 1
+        if python_dev_mode:
+            options["environment"]["PYTHONDEVMODE"] = 1
 
     project_version = "local"