diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2aaeb3641..d300fc25a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -105,6 +105,7 @@
 - Dependant modules are not imported [#614](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/614)
 - Ensure that `Properties` Plugin dependant code works only when corresponding Plugin is enabled [#618](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/618)
 - Also hide full Module name for `web` sub-module in the Project View [#622](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/622)
+- CockpitNG DOM inspection is not properly validating Create Wizard Navigation xml tag [#626](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/626)
 
 ### Other
 - Adjusted inline documentation for Type System [#539](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/539)
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/model/wizardConfig/AbstractAction.java b/src/com/intellij/idea/plugin/hybris/system/cockpitng/model/wizardConfig/AbstractAction.java
index b5d104cd6..70597a4d7 100644
--- a/src/com/intellij/idea/plugin/hybris/system/cockpitng/model/wizardConfig/AbstractAction.java
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/model/wizardConfig/AbstractAction.java
@@ -1,6 +1,6 @@
 /*
  * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -22,13 +22,7 @@
 package com.intellij.idea.plugin.hybris.system.cockpitng.model.wizardConfig;
 
 import com.intellij.idea.plugin.hybris.common.HybrisConstants;
-import com.intellij.util.xml.DomElement;
-import com.intellij.util.xml.GenericAttributeValue;
-import com.intellij.util.xml.GenericDomValue;
-import com.intellij.util.xml.Namespace;
-import com.intellij.util.xml.Required;
-import com.intellij.util.xml.SubTag;
-import com.intellij.util.xml.SubTagList;
+import com.intellij.util.xml.*;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -76,7 +70,6 @@ public interface AbstractAction extends DomElement {
 	 */
 	@NotNull
 	@SubTag ("save-all")
-	@Required
 	GenericDomValue<String> getSaveAll();
 
 
@@ -86,7 +79,6 @@ public interface AbstractAction extends DomElement {
 	 */
 	@NotNull
 	@SubTagList ("save")
-	@Required
 	java.util.List<Save> getSaves();
 	/**
 	 * Adds new child to the list of save children.