diff --git a/ChangeLog b/ChangeLog
index e8461819f4..52b3e1f966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,8 @@ phpMyAdmin - ChangeLog
 - issue #17777 Fix Uncaught TypeError: Cannot read properties of null (reading 'inline') on datepickers when re-opened
 - issue        Fix Original theme buttons style and login form width
 - issue #17892 Fix closing index edit modal and reopening causes it to fire twice
+- issue #17606 Fix preview SQL modal not working inside "Add Index" modal
+- issue        Fix PHP error on adding new column on create table form
 
 5.2.0 (2022-05-10)
 - issue #16521 Upgrade Bootstrap to version 5
diff --git a/composer.json b/composer.json
index 9282d38df4..9ced5f1d55 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,7 @@
         "nikic/fast-route": "^1.3",
         "phpmyadmin/motranslator": "^5.0",
         "phpmyadmin/shapefile": "^3.0.1",
-        "phpmyadmin/sql-parser": "^5.5",
+        "phpmyadmin/sql-parser": "dev-master#a9cd167be77829ec2dd4496ce1010ed6abde92f8",
         "phpmyadmin/twig-i18n-extension": "^4.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0",
diff --git a/templates/columns_definitions/column_attributes.twig b/templates/columns_definitions/column_attributes.twig
index 170fb71f1a..8efc7550da 100644
--- a/templates/columns_definitions/column_attributes.twig
+++ b/templates/columns_definitions/column_attributes.twig
@@ -215,7 +215,9 @@
           {% for mimekey, transform in available_mime['transformation'] %}
             {% set parts = transform|split(':') %}
             <option value="{{ available_mime['transformation_file'][mimekey] }}" title="{{ get_description(available_mime['transformation_file'][mimekey]) }}"
-              {{- column_meta['Field'] is defined and mime_map[column_meta['Field']]['transformation'] is defined
+              {{- column_meta['Field'] is defined
+                and mime_map[column_meta['Field']]['transformation'] is defined
+                and mime_map[column_meta['Field']]['transformation'] is not null
                 and mime_map[column_meta['Field']]['transformation'] matches '@' ~ available_mime['transformation_file_quoted'][mimekey] ~ '3?@i' ? ' selected'}}>
               {{ get_name(available_mime['transformation_file'][mimekey]) ~ ' (' ~ parts[0]|lower ~ ':' ~ parts[1] ~ ')' }}
             </option>