diff --git a/.gitignore b/.gitignore
index 536ba01d44..77b6120417 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ target/
 # ignore NetBeans configuration
 nb-configuration.xml
 *.bak
+.mvn/
+mvn*
diff --git a/pom.xml b/pom.xml
index d6513f75ed..924d3793c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
 		<commons.io.version>2.11.0</commons.io.version>
 		<guava.version>32.0.0-jre</guava.version>
 		<orchestra.file>OrchestraFIXLatest.xml</orchestra.file>
-		<org.quickfixj.orchestra.tools.version>1.0.1</org.quickfixj.orchestra.tools.version>
+		<org.quickfixj.orchestra.tools.version>1.0.2</org.quickfixj.orchestra.tools.version>
 		<proxool.version>0.9.1</proxool.version>
 		<jaxen.version>2.0.0</jaxen.version>
 	</properties>
diff --git a/quickfixj-messages/quickfixj-messages-all/src/main/xsl/minimiseOrchestra.xsl b/quickfixj-messages/quickfixj-messages-all/src/main/xsl/minimiseOrchestra.xsl
index 31b09da216..57df4d4d16 100644
--- a/quickfixj-messages/quickfixj-messages-all/src/main/xsl/minimiseOrchestra.xsl
+++ b/quickfixj-messages/quickfixj-messages-all/src/main/xsl/minimiseOrchestra.xsl
@@ -15,6 +15,7 @@
     </xsl:template>
 
     <!-- filter out fields that are not used in QFJ tests -->
+	<!-- Field 1492 ComplexEventStartDate is included to prove successful compilation of a field extending UTCDateOnly -->
     <xsl:template
         match="fixr:fields/fixr:field[not(
 									      @id = '6' or
@@ -124,6 +125,10 @@
 		                                  @id = '1402' or
 		                                  @id = '1403' or
 		                                  @id = '1404' or
+		                                  @id = '1483' or
+		                                  @id = '1484' or
+		                                  @id = '1491' or
+		                                  @id = '1492' or
 		                                  @id = '1779' or
 		                                  @id = '321007')]"/>
 
@@ -143,7 +148,9 @@
         								  @id = '2045' or
         								  @id = '2046' or
         								  @id = '2059' or
-                                          @id = '2085')]"/>
+                                          @id = '2085' or
+                                          @id = '2145' or
+                                          @id = '2146' )]"/>
 
     <!-- filter out messages that are not used in QFJ tests -->
     <xsl:template
@@ -184,7 +191,7 @@
    	<xsl:template
         match="fixr:components/fixr:component[(@id='1003')]/fixr:componentRef" />
    	<xsl:template
-        match="fixr:components/fixr:component[(@id='1003')]/fixr:groupRef" />
+        match="fixr:components/fixr:component[(@id='1003')]/fixr:groupRef[not(@id='2145')]" />
 
  	<!-- InstrumentLeg -->
  	<xsl:template
@@ -261,7 +268,23 @@
 	    match="fixr:groups/fixr:group[(@id='2059')]/fixr:fieldRef[not(@id='54' or
                                                                       @id='11')]" />
 
- 	<!-- HopGrp 2085 ______________ -->
+	<!-- Complex Events -->
+	<xsl:template
+			match="fixr:groups/fixr:group[(@id='2145')]/fixr:componentRef" />
+	<xsl:template
+			match="fixr:groups/fixr:group[(@id='2145')]/fixr:fieldRef[not(@id='1484')]" />
+	<xsl:template
+			match="fixr:groups/fixr:group[(@id='2145')]/fixr:groupRef[not(@id='2146')]" />
+
+	<!-- Complex Event Dates -->
+	<xsl:template
+			match="fixr:groups/fixr:group[(@id='2146')]/fixr:componentRef" />
+	<xsl:template
+			match="fixr:groups/fixr:group[(@id='2146')]/fixr:groupRef" />
+	<xsl:template
+			match="fixr:groups/fixr:group[(@id='2146')]/fixr:fieldRef[not(@id='1492')]" />
+
+	<!-- HopGrp 2085 ______________ -->
  	<!-- include everything -->
 
  	<!-- ******************************** -->