Combining reporter bug

My combining reporters don't work anymore since I upgraded.
We went from Reporting  5.7.0 to Reporting 6.4.3 on Confluence 5.5.
and upgraded from Scaffolding 7.4.1 to Scaffolding 8.6.2

Here is the storage format

<ac:structured-macro ac:name="repeating-data"><ac:parameter ac:name="name">Testing</ac:parameter><ac:rich-text-body>

<p><ac:structured-macro ac:name="date-data"><ac:parameter ac:name="name">Test</ac:parameter><ac:parameter ac:name="atlassian-macro-output-type">INLINE</ac:parameter><ac:plain-text-body><![CDATA[ ]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="text-data"><ac:parameter ac:name="content">wiki</ac:parameter><ac:parameter ac:name="name">FieldName</ac:parameter><ac:parameter ac:name="atlassian-macro-output-type">INLINE</ac:parameter><ac:parameter ac:name="type">line</ac:parameter><ac:rich-text-body>
<p>&nbsp;</p></ac:rich-text-body></ac:structured-macro></p></ac:rich-text-body></ac:structured-macro>
<p><ac:structured-macro ac:name="date-data"><ac:parameter ac:name="name">TestingMore</ac:parameter><ac:parameter ac:name="atlassian-macro-output-type">INLINE</ac:parameter><ac:plain-text-body><![CDATA[ ]]></ac:plain-text-body></ac:structured-macro></p><ac:structured-macro ac:name="table-data"><ac:parameter ac:name="name">TableTest</ac:parameter><ac:rich-text-body>
<table>
<tbody>
<tr>
<th>Date</th>
<th colspan="1">More</th></tr>
<tr>
<td>
<p><ac:structured-macro ac:name="date-data"><ac:parameter ac:name="name">TableDate</ac:parameter><ac:parameter ac:name="atlassian-macro-output-type">INLINE</ac:parameter><ac:plain-text-body><![CDATA[ ]]></ac:plain-text-body></ac:structured-macro></p></td>
<td colspan="1">
<p><ac:structured-macro ac:name="text-data"><ac:parameter ac:name="content">wiki</ac:parameter><ac:parameter ac:name="name">FieldName</ac:parameter><ac:parameter ac:name="atlassian-macro-output-type">INLINE</ac:parameter><ac:parameter ac:name="type">line</ac:parameter><ac:rich-text-body>
<p>&nbsp;</p></ac:rich-text-body></ac:structured-macro></p></td></tr></tbody></table></ac:rich-text-body></ac:structured-macro>
<p><ac:structured-macro ac:name="report-block"><ac:parameter ac:name="atlassian-macro-output-type">INLINE</ac:parameter><ac:rich-text-body><ac:structured-macro ac:name="combining-reporter"><ac:parameter ac:name="matchAll">false</ac:parameter><ac:rich-text-body><ac:structured-macro ac:name="expanding-reporter"><ac:parameter ac:name="as">eT</ac:parameter><ac:parameter ac:name="">data:Testing</ac:parameter><ac:rich-text-body><ac:structured-macro ac:name="local-reporter"><ac:parameter ac:name="">@self</ac:parameter><ac:rich-text-body>
<p>&nbsp;</p></ac:rich-text-body></ac:structured-macro></ac:rich-text-body></ac:structured-macro><ac:structured-macro ac:name="expanding-reporter"><ac:parameter ac:name="as">eTT</ac:parameter><ac:parameter ac:name="">data:TableTest</ac:parameter><ac:rich-text-body><ac:structured-macro ac:name="local-reporter"><ac:parameter ac:name="">@self</ac:parameter><ac:rich-text-body>
<p>&nbsp;</p></ac:rich-text-body></ac:structured-macro></ac:rich-text-body></ac:structured-macro></ac:rich-text-body></ac:structured-macro><ac:structured-macro ac:name="report-body"><ac:rich-text-body>
<ul>
<li><ac:structured-macro ac:name="report-info"><ac:parameter ac:name="">expanded:item &gt; page:title</ac:parameter></ac:structured-macro> <ac:structured-macro ac:name="report-info"><ac:parameter ac:name="format">dd-MM-yyyy</ac:parameter><ac:parameter ac:name="">expanded:eT &gt; data:Test</ac:parameter></ac:structured-macro> <ac:structured-macro ac:name="report-info"><ac:parameter ac:name="format">dd-MM-yyyy</ac:parameter><ac:parameter ac:name="">expanded:eTT &gt; data:TableDate</ac:parameter></ac:structured-macro> <ac:structured-macro ac:name="report-info"><ac:parameter ac:name="">expanded:eTT &gt; data:FieldName</ac:parameter></ac:structured-macro> <ac:structured-macro ac:name="report-info"><ac:parameter ac:name="">expanded:eT &gt; data:FieldName</ac:parameter></ac:structured-macro></li></ul></ac:rich-text-body></ac:structured-macro></ac:rich-text-body></ac:structured-macro>&nbsp;</p>
<p>&nbsp;</p>

And this is my scaffolding xml
This XML file does not appear to have any style information associated with it. The document tree is shown below.<metadata>
<entry>
<string>Testing</string>
<map>
<entry>
<string>1</string>
<map>
<entry>
<string>Test</string>
<date>2016-09-22 12:00:00.0 CEST</date>

</entry>


<entry>
<string>FieldName</string>
<string>B</string>

</entry>



</map>



</entry>


<entry>
<string>0</string>
<map>
<entry>
<string>Test</string>
<date>2016-09-23 12:00:00.0 CEST</date>

</entry>


<entry>
<string>FieldName</string>
<string>A</string>

</entry>



</map>



</entry>


<entry>
<string>rowCount</string>
<int>2</int>

</entry>



</map>



</entry>


<entry>
<string>TableTest</string>
<map>
<entry>
<string>1</string>
<map>
<entry>
<string>FieldName</string>
<string>D</string>

</entry>


<entry>
<string>TableDate</string>
<date>2016-09-08 12:00:00.0 CEST</date>

</entry>



</map>



</entry>


<entry>
<string>0</string>
<map>
<entry>
<string>FieldName</string>
<string>C</string>

</entry>


<entry>
<string>TableDate</string>
<date>2016-09-15 12:00:00.0 CEST</date>

</entry>



</map>



</entry>


<entry>
<string>rowCount</string>
<int>2</int>

</entry>



</map>



</entry>


<entry>
<string>TestingMore</string>
<date>2016-09-16 12:00:00.0 CEST</date>

</entry>



</metadata>


I used to get the data from both tables.
Now It only chooses one!
It seems to show data from the lowest local-reporter in the combining macro