Index: /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java	(revision 34971)
+++ /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java	(revision 34972)
@@ -37,4 +37,5 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.UserCancelException;
+import org.openstreetmap.josm.tools.Utils;
 
 import mergeoverlap.hack.MyCombinePrimitiveResolverDialog;
@@ -80,5 +81,5 @@
                 ways.add(way);
                 List<Relation> rels = new ArrayList<>();
-                for (Relation r : OsmPrimitive.getFilteredList(way.getReferrers(), Relation.class)) {
+                for (Relation r : Utils.filteredCollection(way.getReferrers(), Relation.class)) {
                     rels.add(r);
                 }
Index: /applications/editors/josm/plugins/opendata/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/build.xml	(revision 34971)
+++ /applications/editors/josm/plugins/opendata/build.xml	(revision 34972)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="14347"/>
+    <property name="plugin.main.version" value="14977"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java	(revision 34971)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java	(revision 34972)
@@ -64,4 +64,5 @@
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.ReflectionUtils;
 import org.openstreetmap.josm.tools.UserCancelException;
 import org.openstreetmap.josm.tools.Utils;
@@ -354,5 +355,5 @@
                         try {
                             Field f = AbstractIdentifiedObject.class.getDeclaredField("identifiers");
-                            Utils.setObjectsAccessible(f);
+                            ReflectionUtils.setObjectsAccessible(f);
                             f.set(crs, Collections.singleton(new NamedIdentifier(Citations.fromName("EPSG"), epsgCode.toString())));
                         } catch (ReflectiveOperationException | SecurityException e) {
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabFiles.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabFiles.java	(revision 34971)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabFiles.java	(revision 34972)
@@ -19,5 +19,5 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.ReflectionUtils;
 
 /**
@@ -40,5 +40,5 @@
         try {
             Field furls = ShpFiles.class.getDeclaredField("urls");
-            Utils.setObjectsAccessible(furls);
+            ReflectionUtils.setObjectsAccessible(furls);
             urls = (Map<ShpFileType, URL>) furls.get(this);
         } catch (ReflectiveOperationException e) {
Index: /applications/editors/josm/plugins/print/build.xml
===================================================================
--- /applications/editors/josm/plugins/print/build.xml	(revision 34971)
+++ /applications/editors/josm/plugins/print/build.xml	(revision 34972)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Added a field to specify the map scale."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="14977"/>
 
     <property name="plugin.author" value="Kai Pastor"/>
Index: /applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintDialog.java
===================================================================
--- /applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintDialog.java	(revision 34971)
+++ /applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintDialog.java	(revision 34972)
@@ -64,5 +64,5 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.ReflectionUtils;
 
 /**
@@ -524,5 +524,5 @@
                 Method getEnumValueTable = realClass.getDeclaredMethod("getEnumValueTable");
                 Constructor<? extends Attribute> constructor = realClass.getDeclaredConstructor(int.class);
-                Utils.setObjectsAccessible(getEnumValueTable, constructor);
+                ReflectionUtils.setObjectsAccessible(getEnumValueTable, constructor);
                 Attribute fakeInstance = constructor.newInstance(Integer.MAX_VALUE);
                 EnumSyntax[] enumTable = (EnumSyntax[]) getEnumValueTable.invoke(fakeInstance);
Index: /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java
===================================================================
--- /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java	(revision 34971)
+++ /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java	(revision 34972)
@@ -31,4 +31,5 @@
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Geometry.PolygonIntersection;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -253,6 +254,6 @@
 
         List<Way> ways = intersection(
-                OsmPrimitive.getFilteredList(segment.firstNode().getReferrers(), Way.class),
-                OsmPrimitive.getFilteredList(segment.lastNode().getReferrers(), Way.class));
+                Utils.filteredCollection(segment.firstNode().getReferrers(), Way.class),
+                Utils.filteredCollection(segment.lastNode().getReferrers(), Way.class));
         ways.remove(segment);
         for (Iterator<Way> iter = ways.iterator(); iter.hasNext();) {
Index: /applications/editors/josm/plugins/simplifyarea/src/org/openstreetmap/josm/plugins/simplifyarea/SimplifyAreaAction.java
===================================================================
--- /applications/editors/josm/plugins/simplifyarea/src/org/openstreetmap/josm/plugins/simplifyarea/SimplifyAreaAction.java	(revision 34971)
+++ /applications/editors/josm/plugins/simplifyarea/src/org/openstreetmap/josm/plugins/simplifyarea/SimplifyAreaAction.java	(revision 34972)
@@ -40,4 +40,5 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 public final class SimplifyAreaAction extends JosmAction {
@@ -108,5 +109,5 @@
             }
         }
-        final Collection<Way> ways = OsmPrimitive.getFilteredSet(selection, Way.class);
+        final Collection<Way> ways = Utils.filteredCollection(selection, Way.class);
         if (ways.isEmpty()) {
             alertSelectAtLeastOneWay();
Index: /applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java
===================================================================
--- /applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java	(revision 34971)
+++ /applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java	(revision 34972)
@@ -47,4 +47,5 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.UserCancelException;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -119,5 +120,5 @@
                 outline = (Way) prim;
             } else if (sel.size() > 1) {
-                List<Way> ways = OsmPrimitive.getFilteredList(sel, Way.class);
+                List<Way> ways = new ArrayList<>(Utils.filteredCollection(sel, Way.class));
                 Iterator<Way> wit = ways.iterator();
                 while (wit.hasNext()) {
@@ -143,5 +144,5 @@
                     throw new InvalidUserInputException("no outline way found");
 
-                List<Node> nodes = OsmPrimitive.getFilteredList(sel, Node.class);
+                List<Node> nodes = new ArrayList<>(Utils.filteredCollection(sel, Node.class));
                 Iterator<Node> nit = nodes.iterator();
                 // Actually this should test if the selected address nodes lie