diff --git a/features/org.eclipse.uml2.uml-feature/feature.xml b/features/org.eclipse.uml2.uml-feature/feature.xml
index cf8a86d..6072e6d 100644
--- a/features/org.eclipse.uml2.uml-feature/feature.xml
+++ b/features/org.eclipse.uml2.uml-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.uml2.uml"
       label="%feature.label"
-      version="5.4.0.qualifier"
+      version="5.5.0.qualifier"
       provider-name="%feature.provider-name"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
@@ -13,7 +13,7 @@
    </description>
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2003, 2017 IBM Corporation, Embarcadero Technologies, CEA, and others.
+      Copyright (c) 2003, 2018 IBM Corporation, Embarcadero Technologies, CEA, 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
diff --git a/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF
index 9aae0f0..dc6d4ac 100644
--- a/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.uml.resources; singleton:=true
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.uml2.uml.resources/src/org/eclipse/uml2/uml/resources/util/UMLResourcesUtil.java b/plugins/org.eclipse.uml2.uml.resources/src/org/eclipse/uml2/uml/resources/util/UMLResourcesUtil.java
index 92d189a..2c2c4c6 100644
--- a/plugins/org.eclipse.uml2.uml.resources/src/org/eclipse/uml2/uml/resources/util/UMLResourcesUtil.java
+++ b/plugins/org.eclipse.uml2.uml.resources/src/org/eclipse/uml2/uml/resources/util/UMLResourcesUtil.java
@@ -10,7 +10,7 @@
  *   Kenn Hussey (CEA) - 389542, 399544, 425846, 418466, 429352
  *   Mikael Barbero (Obeo) - 414572
  *   Christian W. Damus (CEA) - 414572, 401682
- *   Kenn Hussey - 526217
+ *   Kenn Hussey - 526217, 539580
  */
 package org.eclipse.uml2.uml.resources.util;
 
@@ -193,20 +193,20 @@
 
 	/**
 	 * <p>
-	 * Initializes the registries for the specified resource set (and/or the
-	 * global registries) with the registrations needed to work with UML2
-	 * resources in stand-alone mode (i.e., without Eclipse).
+	 * Initializes the global registries and, if provided, the local registries
+	 * for the specified resource set, with the registrations needed to work
+	 * with UML2 resources in stand-alone mode (i.e., without Eclipse).
 	 * </p>
 	 * <p>
-	 * <string>Note</string> that as of the 4.2 release, clients now have more
-	 * fine-grained control of which registries (local or global) are
+	 * <string>Note</string> that as of the 5.0 release, clients now have more
+	 * fine-grained control over which registries (local or global) are
 	 * initialized. Clients are encouraged to use these new APIs to ensure
 	 * optimal behaviour and, where necessary, isolation from other code in the
 	 * same class loader using the global registries.
 	 * </p>
 	 * 
 	 * @param resourceSet
-	 *            The resource set whose registries to initialize, or
+	 *            The resource set whose local registries to initialize, or
 	 *            <code>null</code> to perform only global registrations.
 	 * @return The resource set (or <code>null</code>).
 	 *