diff -u results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/reference/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.media.impl.MediaHandlerImpl.jimple results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/rebuild/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.media.impl.MediaHandlerImpl.jimple
--- results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/reference/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.media.impl.MediaHandlerImpl.jimple	2025-03-12 17:56:31.068313937 +0000
+++ results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/rebuild/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.media.impl.MediaHandlerImpl.jimple	2025-03-12 17:57:09.355711882 +0000
@@ -118,25 +118,25 @@
 }
 io.wcm.handler.media.Media processRequest(io.wcm.handler.media.MediaRequest)
 {
-io.wcm.handler.media.MediaArgs v, v, v, v;
-org.apache.sling.api.adapter.Adaptable v, v, v;
-io.wcm.handler.media.MediaInvalidReason v, v, v, v;
-boolean v, v, v, v, v, v, v, v;
 java.util.Set v, v;
 io.wcm.handler.media.MediaRequest v;
-java.util.List v, v, v, v;
 io.wcm.handler.media.format.MediaFormatHandler v;
 io.wcm.handler.media.Media v, v;
 io.wcm.handler.media.spi.MediaSource v, v;
 io.wcm.handler.media.spi.MediaHandlerConfig v, v, v, v, v;
+java.lang.String v, v, v, v, v, v, v, v, v, v, v;
+java.lang.RuntimeException v, v, v, v;
+io.wcm.handler.media.impl.MediaFormatResolver v;
+io.wcm.handler.media.MediaArgs v, v, v, v;
+org.apache.sling.api.adapter.Adaptable v, v, v;
+io.wcm.handler.media.MediaInvalidReason v, v, v, v;
+boolean v, v, v, v, v, v, v, v;
+java.util.List v, v, v, v;
 java.util.function.Function v;
-java.lang.String v, v, v, v, v;
 org.slf4j.Logger v, v, v, v, v, v;
 java.util.Iterator v, v, v;
-java.lang.RuntimeException v, v, v, v;
 io.wcm.handler.media.impl.MediaHandlerImpl v;
 java.lang.Object v, v, v, v, v, v;
-io.wcm.handler.media.impl.MediaFormatResolver v;
 v := @this: io.wcm.handler.media.impl.MediaHandlerImpl;
 v := @parameter: io.wcm.handler.media.MediaRequest;
 v = null;
@@ -220,7 +220,9 @@
 v = interfaceinvoke v.<io.wcm.handler.media.spi.MediaProcessor: io.wcm.handler.media.Media process(io.wcm.handler.media.Media)>(v);
 if v != null goto label;
 v = new java.lang.RuntimeException;
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (io.wcm.handler.media.spi.MediaProcessor,io.wcm.handler.media.MediaRequest)>(v, v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("MediaPreProcessor \'\u0001\' returned null, request: \u0001");
+v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
+v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String,java.lang.String)>(v, v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("MediaPreProcessor \'\u0001\' returned null, request: \u0001");
 specialinvoke v.<java.lang.RuntimeException: void <init>(java.lang.String)>(v);
 throw v;
 label:
@@ -229,7 +231,9 @@
 v = virtualinvoke v.<io.wcm.handler.media.spi.MediaSource: io.wcm.handler.media.Media resolveMedia(io.wcm.handler.media.Media)>(v);
 if v != null goto label;
 v = new java.lang.RuntimeException;
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (io.wcm.handler.media.spi.MediaSource,io.wcm.handler.media.MediaRequest)>(v, v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("MediaType \'\u0001\' returned null, request: \u0001");
+v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
+v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String,java.lang.String)>(v, v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("MediaType \'\u0001\' returned null, request: \u0001");
 specialinvoke v.<java.lang.RuntimeException: void <init>(java.lang.String)>(v);
 throw v;
 label:
@@ -254,7 +258,9 @@
 v = interfaceinvoke v.<io.wcm.handler.media.spi.MediaProcessor: io.wcm.handler.media.Media process(io.wcm.handler.media.Media)>(v);
 if v != null goto label;
 v = new java.lang.RuntimeException;
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (io.wcm.handler.media.spi.MediaProcessor,io.wcm.handler.media.MediaRequest)>(v, v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("MediaPostProcessor \'\u0001\' returned null, request: \u0001");
+v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
+v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String,java.lang.String)>(v, v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("MediaPostProcessor \'\u0001\' returned null, request: \u0001");
 specialinvoke v.<java.lang.RuntimeException: void <init>(java.lang.String)>(v);
 throw v;
 label:
diff -u results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/reference/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.media.markup.MediaMarkupBuilderUtil.jimple results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/rebuild/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.media.markup.MediaMarkupBuilderUtil.jimple
--- results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/reference/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.media.markup.MediaMarkupBuilderUtil.jimple	2025-03-12 17:56:31.100313433 +0000
+++ results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/rebuild/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.media.markup.MediaMarkupBuilderUtil.jimple	2025-03-12 17:57:09.387711379 +0000
@@ -122,7 +122,7 @@
 io.wcm.handler.media.MediaArgs v, v;
 int[] v;
 int v, v;
-java.lang.String v, v, v;
+java.lang.String v, v, v, v;
 io.wcm.handler.media.markup.DragDropSupport v, v;
 boolean v, v;
 org.apache.sling.api.resource.Resource v, v, v;
@@ -173,7 +173,8 @@
 v = new java.lang.IllegalArgumentException;
 v = virtualinvoke v.<io.wcm.handler.media.MediaRequest: io.wcm.handler.media.MediaArgs getMediaArgs()>();
 v = virtualinvoke v.<io.wcm.handler.media.MediaArgs: io.wcm.handler.media.markup.DragDropSupport getDragDropSupport()>();
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (io.wcm.handler.media.markup.DragDropSupport)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unsupported drag&drop support mode: \u0001");
+v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unsupported drag&drop support mode: \u0001");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 }
@@ -196,7 +197,7 @@
 com.day.cq.wcm.api.components.EditContext v, v, v;
 int[] v;
 int v, v;
-java.lang.String v, v, v, v, v;
+java.lang.String v, v, v, v, v, v;
 boolean v, v, v;
 com.day.cq.wcm.api.components.EditConfig v, v;
 java.util.Set v;
@@ -269,7 +270,8 @@
 v = new java.lang.IllegalArgumentException;
 v = virtualinvoke v.<io.wcm.handler.media.MediaRequest: io.wcm.handler.media.MediaArgs getMediaArgs()>();
 v = virtualinvoke v.<io.wcm.handler.media.MediaArgs: io.wcm.handler.media.markup.IPERatioCustomize getIPERatioCustomize()>();
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (io.wcm.handler.media.markup.IPERatioCustomize)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unsupported IPE ratio customize mode: \u0001");
+v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unsupported IPE ratio customize mode: \u0001");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 }
diff -u results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/reference/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.mediasource.dam.impl.DamUriTemplate.jimple results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/rebuild/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.mediasource.dam.impl.DamUriTemplate.jimple
--- results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/reference/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.mediasource.dam.impl.DamUriTemplate.jimple	2025-03-12 17:56:31.160312491 +0000
+++ results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/rebuild/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.mediasource.dam.impl.DamUriTemplate.jimple	2025-03-12 17:57:09.455710310 +0000
@@ -79,7 +79,7 @@
 java.lang.Double v;
 io.wcm.handler.mediasource.dam.impl.DamContext v;
 int v, v;
-java.lang.String v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v;
+java.lang.String v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v;
 com.day.cq.dam.api.Asset v, v;
 com.day.cq.dam.api.Rendition v;
 java.lang.IllegalArgumentException v;
@@ -136,7 +136,8 @@
 goto label;
 label:
 v = new java.lang.IllegalArgumentException;
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (io.wcm.handler.media.UriTemplateType)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unsupported type: \u0001");
+v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unsupported type: \u0001");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 label:
@@ -149,7 +150,7 @@
 int[] v;
 java.lang.Long v;
 int v, v;
-java.lang.String v, v, v, v, v;
+java.lang.String v, v, v, v, v, v;
 io.wcm.handler.media.UriTemplateType v, v;
 io.wcm.handler.media.CropDimension v;
 java.lang.IllegalArgumentException v;
@@ -191,7 +192,8 @@
 goto label;
 label:
 v = new java.lang.IllegalArgumentException;
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (io.wcm.handler.media.UriTemplateType)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unsupported type for Web-optimized image delivery: \u0001");
+v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unsupported type for Web-optimized image delivery: \u0001");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 label:
@@ -253,7 +255,7 @@
 io.wcm.handler.media.UriTemplateType v;
 int[] v;
 int v, v;
-java.lang.String v;
+java.lang.String v, v;
 java.lang.IllegalArgumentException v;
 v := @parameter: io.wcm.handler.media.UriTemplateType;
 v = <io.wcm.handler.mediasource.dam.impl.DamUriTemplate$1: int[] $SwitchMap$io$wcm$handler$media$UriTemplateType>;
@@ -274,7 +276,8 @@
 return "hei={height}";
 label:
 v = new java.lang.IllegalArgumentException;
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (io.wcm.handler.media.UriTemplateType)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unsupported type for Dynamic Media: \u0001");
+v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unsupported type for Dynamic Media: \u0001");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 }
diff -u results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/reference/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.mediasource.inline.InlineUriTemplate.jimple results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/rebuild/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.mediasource.inline.InlineUriTemplate.jimple
--- results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/reference/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.mediasource.inline.InlineUriTemplate.jimple	2025-03-12 17:56:31.288310478 +0000
+++ results/io.wcm/io.wcm.handler.media/2.2.2/jnorm/rebuild/io.wcm.handler.media-2.2.2-bundle.jar:io.wcm.handler.media-2.2.2-bundle.jar/io.wcm.handler.mediasource.inline.InlineUriTemplate.jimple	2025-03-12 17:57:09.567708549 +0000
@@ -43,7 +43,7 @@
 io.wcm.handler.url.UrlBuilder v, v;
 java.lang.Double v;
 int v, v;
-java.lang.String v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v;
+java.lang.String v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v;
 org.apache.sling.api.resource.Resource v, v;
 java.lang.IllegalArgumentException v;
 java.lang.Object v;
@@ -101,7 +101,8 @@
 goto label;
 label:
 v = new java.lang.IllegalArgumentException;
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (io.wcm.handler.media.UriTemplateType)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unsupported type: \u0001");
+v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unsupported type: \u0001");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 label:
