--- old/src/hotspot/share/jfr/metadata/metadata.xml	2020-05-18 23:08:37.963937359 +0200
+++ new/src/hotspot/share/jfr/metadata/metadata.xml	2020-05-18 23:08:37.702928893 +0200
@@ -1001,11 +1001,11 @@
   <Event name="ZPageAllocation" category="Java Virtual Machine, GC, Detailed" label="ZGC Page Allocation" description="Allocation of a ZPage" thread="true" stackTrace="true">
      <Field type="ZPageTypeType" name="type" label="Type" />
      <Field type="ulong" contentType="bytes" name="size" label="Size" />
+     <Field type="boolean" name="nonBlocking" label="Non-blocking" />
+     <Field type="boolean" name="noReserve" label="No Reserve" />
      <Field type="ulong" contentType="bytes" name="usedAfter" label="Used After" />
      <Field type="ulong" contentType="bytes" name="freeAfter" label="Free After" />
      <Field type="ulong" contentType="bytes" name="inCacheAfter" label="In Cache After" />
-     <Field type="boolean" name="nonBlocking" label="Non-blocking" />
-     <Field type="boolean" name="noReserve" label="No Reserve" />
   </Event>
 
   <Event name="ZPageCacheFlush" category="Java Virtual Machine, GC, Detailed" label="ZGC Page Cache Flush" description="Flushing of ZPages" thread="true" stackTrace="true">
@@ -1046,8 +1046,6 @@
   </Event>
 
   <Event name="ZUncommit" category="Java Virtual Machine, GC, Detailed" label="ZGC Uncommit" description="Uncommitting of memory" thread="true">
-    <Field type="ulong" contentType="bytes" name="capacityBefore" label="Capacity Before" />
-    <Field type="ulong" contentType="bytes" name="capacityAfter" label="Capacity After" />
     <Field type="ulong" contentType="bytes" name="uncommitted" label="Uncommitted" />
   </Event>