diff --git a/org.eclipse.gmf.runtime-feature/feature.xml b/org.eclipse.gmf.runtime-feature/feature.xml
index 79ee042..04df222 100644
--- a/org.eclipse.gmf.runtime-feature/feature.xml
+++ b/org.eclipse.gmf.runtime-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.gmf"
       label="%featureName"
-      version="1.8.0.qualifier"
+      version="1.8.1.qualifier"
       provider-name="%providerName"
       image="modeling32.png"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.gmf.runtime-feature/pom.xml b/org.eclipse.gmf.runtime-feature/pom.xml
index ac5c986..d8bcede 100644
--- a/org.eclipse.gmf.runtime-feature/pom.xml
+++ b/org.eclipse.gmf.runtime-feature/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.gmf.runtime</groupId>
   <artifactId>org.eclipse.gmf</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <parent>
diff --git a/org.eclipse.gmf.runtime.common.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.common.ui/META-INF/MANIFEST.MF
index f59b4b5..0884fdb 100644
--- a/org.eclipse.gmf.runtime.common.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmf.runtime.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.gmf.runtime.common.ui; singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.1.qualifier
 Bundle-Activator: org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.gmf.runtime.common.ui/pom.xml b/org.eclipse.gmf.runtime.common.ui/pom.xml
index 0f33325..4380d06 100644
--- a/org.eclipse.gmf.runtime.common.ui/pom.xml
+++ b/org.eclipse.gmf.runtime.common.ui/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.gmf.runtime.common.ui</groupId>
   <artifactId>org.eclipse.gmf.runtime.common.ui</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/UIModificationValidator.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/UIModificationValidator.java
index e40e8bf..5fc3cb8 100644
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/UIModificationValidator.java
+++ b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/UIModificationValidator.java
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -204,7 +204,7 @@
 	 * Disposes this UI modification validator.
 	 */
     public void dispose() {
-        if (listener != null) {
+    	if (listener != null && !listener.getShell().isDisposed()) {
         	DisplayUtils.getDisplay().asyncExec(new Runnable() {
                 public void run() {
                     PlatformUI.getWorkbench().removeWindowListener(listener);
diff --git a/org.eclipse.gmf.runtime.repository/category.xml b/org.eclipse.gmf.runtime.repository/category.xml
index c324629..09c8931 100644
--- a/org.eclipse.gmf.runtime.repository/category.xml
+++ b/org.eclipse.gmf.runtime.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.gmf_1.8.0.qualifier.jar" id="org.eclipse.gmf" version="1.8.0.qualifier">
+   <feature url="features/org.eclipse.gmf_1.8.1.qualifier.jar" id="org.eclipse.gmf" version="1.8.1.qualifier">
       <category name="gmf-runtime"/>
    </feature>
    <feature url="features/org.eclipse.gmf.examples.runtime_1.8.1.qualifier.jar" id="org.eclipse.gmf.examples.runtime" version="1.8.1.qualifier">
@@ -9,7 +9,7 @@
    <feature url="features/org.eclipse.gmf.examples.runtime.ui.pde_1.8.0.qualifier.jar" id="org.eclipse.gmf.examples.runtime.ui.pde" version="1.8.0.qualifier">
       <category name="gmf-runtime"/>
    </feature>
-   <feature url="features/org.eclipse.gmf.runtime.sdk_1.8.0.qualifier.jar" id="org.eclipse.gmf.runtime.sdk" version="1.8.0.qualifier">
+   <feature url="features/org.eclipse.gmf.runtime.sdk_1.8.1.qualifier.jar" id="org.eclipse.gmf.runtime.sdk" version="1.8.1.qualifier">
       <category name="gmf-runtime"/>
    </feature>
    <feature url="features/org.eclipse.gmf.runtime.thirdparty_1.8.0.qualifier.jar" id="org.eclipse.gmf.runtime.thirdparty" version="1.8.0.qualifier">
@@ -18,7 +18,7 @@
    <feature url="features/org.eclipse.gmf.runtime.thirdparty.source_1.8.0.qualifier.jar" id="org.eclipse.gmf.runtime.thirdparty.source" version="1.8.0.qualifier">
       <category name="gmf-runtime"/>
    </feature>
-   <feature url="features/org.eclipse.gmf.source_1.8.0.qualifier.jar" id="org.eclipse.gmf.source" version="1.8.0.qualifier">
+   <feature url="features/org.eclipse.gmf.source_1.8.1.qualifier.jar" id="org.eclipse.gmf.source" version="1.8.1.qualifier">
       <category name="gmf-runtime"/>
    </feature>
    <feature url="features/org.eclipse.gmf.tests.runtime_1.8.0.qualifier.jar" id="org.eclipse.gmf.tests.runtime" version="1.8.0.qualifier">
diff --git a/org.eclipse.gmf.runtime.repository/pom.xml b/org.eclipse.gmf.runtime.repository/pom.xml
index 5949460..9ff6d32 100644
--- a/org.eclipse.gmf.runtime.repository/pom.xml
+++ b/org.eclipse.gmf.runtime.repository/pom.xml
@@ -10,7 +10,7 @@
 		<relativePath>../org.eclipse.gmf.runtime.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.gmf.runtime.repository</artifactId>
-	<version>1.8.0-SNAPSHOT</version>
+	<version>1.8.1-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<profiles>
diff --git a/org.eclipse.gmf.runtime.sdk-feature/feature.xml b/org.eclipse.gmf.runtime.sdk-feature/feature.xml
index 101d858..7a34120 100755
--- a/org.eclipse.gmf.runtime.sdk-feature/feature.xml
+++ b/org.eclipse.gmf.runtime.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.gmf.runtime.sdk"
       label="%featureName"
-      version="1.8.0.qualifier"
+      version="1.8.1.qualifier"
       provider-name="%providerName"
       image="modeling32.png"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.gmf.runtime.sdk-feature/pom.xml b/org.eclipse.gmf.runtime.sdk-feature/pom.xml
index 9ea0325..14bfe81 100644
--- a/org.eclipse.gmf.runtime.sdk-feature/pom.xml
+++ b/org.eclipse.gmf.runtime.sdk-feature/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.gmf.runtime</groupId>
   <artifactId>org.eclipse.gmf.runtime.sdk</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <parent>
diff --git a/org.eclipse.gmf.source-feature/feature.xml b/org.eclipse.gmf.source-feature/feature.xml
index be6072f..d699585 100644
--- a/org.eclipse.gmf.source-feature/feature.xml
+++ b/org.eclipse.gmf.source-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.gmf.source"
       label="%featureName"
-      version="1.8.0.qualifier"
+      version="1.8.1.qualifier"
       provider-name="%providerName"
       image="modeling32.png"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.gmf.source-feature/pom.xml b/org.eclipse.gmf.source-feature/pom.xml
index 56c8fa2..a0ed33b 100644
--- a/org.eclipse.gmf.source-feature/pom.xml
+++ b/org.eclipse.gmf.source-feature/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.gmf.runtime</groupId>
   <artifactId>org.eclipse.gmf.source</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <parent>
diff --git a/org.eclipse.gmf/META-INF/MANIFEST.MF b/org.eclipse.gmf/META-INF/MANIFEST.MF
index 7219248..fccd62b 100644
--- a/org.eclipse.gmf/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.gmf
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.1.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.gmf/pom.xml b/org.eclipse.gmf/pom.xml
index cf87f9e..3a35e20 100644
--- a/org.eclipse.gmf/pom.xml
+++ b/org.eclipse.gmf/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.gmf-runtime</groupId>
   <artifactId>org.eclipse.gmf</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>