diff --git a/.github/workflows/MediaConch_Checks.yml b/.github/workflows/MediaConch_Checks.yml
index 8bbcec12..5c79dcb4 100644
--- a/.github/workflows/MediaConch_Checks.yml
+++ b/.github/workflows/MediaConch_Checks.yml
@@ -26,7 +26,7 @@ jobs:
             pip --disable-pip-version-check install git+https://github.com/vi/mkvparse.git
           fi
           if [ "$RUNNER_OS" == "macOS" ]; then
-            brew install libtool automake libxslt jansson qt sfk xmlstarlet ffmpeg
+            brew install libtool automake libxslt libevent jansson qt sfk xmlstarlet ffmpeg
             sudo pip --disable-pip-version-check install --prefix /usr/local git+https://github.com/vi/mkvparse.git
           fi
       - name: Get ZenLib info
diff --git a/Source/Common/generated/ImplementationReportXsl.h b/Source/Common/generated/ImplementationReportXsl.h
index 16ac428d..8abc8b86 100644
--- a/Source/Common/generated/ImplementationReportXsl.h
+++ b/Source/Common/generated/ImplementationReportXsl.h
@@ -155,7 +155,7 @@ const char implementation_report_xsl[] = {
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x63','\x61','\x6c','\x6c','\x2d','\x74','\x65','\x6d','\x70','\x6c','\x61','\x74','\x65','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x73','\x69','\x7a','\x65','\x5f','\x69','\x73','\x5f','\x6e','\x6f','\x74','\x5f','\x75','\x6e','\x6c','\x69','\x6d','\x69','\x74','\x65','\x64','\x22','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x77','\x69','\x74','\x68','\x2d','\x70','\x61','\x72','\x61','\x6d','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x69','\x63','\x69','\x64','\x22','\x3e','\x45','\x42','\x4d','\x4c','\x2d','\x45','\x4c','\x45','\x4d','\x2d','\x55','\x4e','\x4b','\x4e','\x4f','\x57','\x4e','\x2d','\x53','\x49','\x5a','\x45','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x77','\x69','\x74','\x68','\x2d','\x70','\x61','\x72','\x61','\x6d','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x77','\x69','\x74','\x68','\x2d','\x70','\x61','\x72','\x61','\x6d','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x76','\x65','\x72','\x73','\x69','\x6f','\x6e','\x22','\x3e','\x31','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x77','\x69','\x74','\x68','\x2d','\x70','\x61','\x72','\x61','\x6d','\x3e','\x0a'
-,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x77','\x69','\x74','\x68','\x2d','\x70','\x61','\x72','\x61','\x6d','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x22','\x20','\x73','\x65','\x6c','\x65','\x63','\x74','\x3d','\x22','\x6d','\x6d','\x74','\x3a','\x4d','\x69','\x63','\x72','\x6f','\x4d','\x65','\x64','\x69','\x61','\x54','\x72','\x61','\x63','\x65','\x2f','\x2f','\x6d','\x6d','\x74','\x3a','\x62','\x5b','\x6e','\x6f','\x74','\x28','\x61','\x6e','\x63','\x65','\x73','\x74','\x6f','\x72','\x3a','\x3a','\x6d','\x6d','\x74','\x3a','\x62','\x5b','\x40','\x6e','\x3d','\x27','\x46','\x69','\x6c','\x65','\x44','\x61','\x74','\x61','\x27','\x5d','\x29','\x5d','\x5b','\x40','\x6e','\x21','\x3d','\x27','\x53','\x65','\x67','\x6d','\x65','\x6e','\x74','\x27','\x5d','\x5b','\x40','\x6e','\x21','\x3d','\x27','\x43','\x6c','\x75','\x73','\x74','\x65','\x72','\x27','\x5d','\x5b','\x6d','\x6d','\x74','\x3a','\x62','\x5b','\x31','\x5d','\x5b','\x40','\x6e','\x3d','\x27','\x48','\x65','\x61','\x64','\x65','\x72','\x27','\x5d','\x2f','\x6d','\x6d','\x74','\x3a','\x64','\x5b','\x40','\x6e','\x3d','\x27','\x4e','\x61','\x6d','\x65','\x27','\x5d','\x5d','\x5b','\x6d','\x6d','\x74','\x3a','\x62','\x5b','\x31','\x5d','\x5b','\x40','\x6e','\x3d','\x27','\x48','\x65','\x61','\x64','\x65','\x72','\x27','\x5d','\x2f','\x6d','\x6d','\x74','\x3a','\x64','\x5b','\x40','\x6e','\x3d','\x27','\x53','\x69','\x7a','\x65','\x27','\x5d','\x3d','\x27','\x55','\x6e','\x6c','\x69','\x6d','\x69','\x74','\x65','\x64','\x27','\x5d','\x22','\x2f','\x3e','\x0a'
+,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x77','\x69','\x74','\x68','\x2d','\x70','\x61','\x72','\x61','\x6d','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x22','\x20','\x73','\x65','\x6c','\x65','\x63','\x74','\x3d','\x22','\x6d','\x6d','\x74','\x3a','\x4d','\x69','\x63','\x72','\x6f','\x4d','\x65','\x64','\x69','\x61','\x54','\x72','\x61','\x63','\x65','\x2f','\x2f','\x6d','\x6d','\x74','\x3a','\x62','\x5b','\x6e','\x6f','\x74','\x28','\x61','\x6e','\x63','\x65','\x73','\x74','\x6f','\x72','\x3a','\x3a','\x6d','\x6d','\x74','\x3a','\x62','\x5b','\x40','\x6e','\x3d','\x27','\x46','\x69','\x6c','\x65','\x44','\x61','\x74','\x61','\x27','\x5d','\x29','\x5d','\x5b','\x40','\x6e','\x21','\x3d','\x27','\x53','\x65','\x67','\x6d','\x65','\x6e','\x74','\x27','\x5d','\x5b','\x40','\x6e','\x21','\x3d','\x27','\x43','\x6c','\x75','\x73','\x74','\x65','\x72','\x27','\x5d','\x5b','\x6d','\x6d','\x74','\x3a','\x62','\x5b','\x31','\x5d','\x5b','\x40','\x6e','\x3d','\x27','\x48','\x65','\x61','\x64','\x65','\x72','\x27','\x5d','\x2f','\x6d','\x6d','\x74','\x3a','\x64','\x5b','\x40','\x6e','\x3d','\x27','\x4e','\x61','\x6d','\x65','\x27','\x5d','\x5d','\x5b','\x6d','\x6d','\x74','\x3a','\x62','\x5b','\x31','\x5d','\x5b','\x40','\x6e','\x3d','\x27','\x48','\x65','\x61','\x64','\x65','\x72','\x27','\x5d','\x2f','\x6d','\x6d','\x74','\x3a','\x64','\x5b','\x40','\x6e','\x3d','\x27','\x53','\x69','\x7a','\x65','\x27','\x20','\x61','\x6e','\x64','\x20','\x28','\x2e','\x3d','\x27','\x55','\x6e','\x6c','\x69','\x6d','\x69','\x74','\x65','\x64','\x27','\x20','\x6f','\x72','\x20','\x40','\x2a','\x5b','\x73','\x74','\x61','\x72','\x74','\x73','\x2d','\x77','\x69','\x74','\x68','\x28','\x6e','\x61','\x6d','\x65','\x28','\x29','\x2c','\x20','\x27','\x69','\x27','\x29','\x5d','\x3d','\x27','\x55','\x6e','\x6c','\x69','\x6d','\x69','\x74','\x65','\x64','\x27','\x29','\x5d','\x5d','\x22','\x2f','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x63','\x61','\x6c','\x6c','\x2d','\x74','\x65','\x6d','\x70','\x6c','\x61','\x74','\x65','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x21','\x2d','\x2d','\x20','\x2f','\x45','\x42','\x4d','\x4c','\x2d','\x45','\x4c','\x45','\x4d','\x2d','\x55','\x4e','\x4b','\x4e','\x4f','\x57','\x4e','\x2d','\x53','\x49','\x5a','\x45','\x20','\x2d','\x2d','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x21','\x2d','\x2d','\x20','\x45','\x42','\x4d','\x4c','\x2d','\x45','\x4c','\x45','\x4d','\x45','\x4e','\x54','\x2d','\x4e','\x4f','\x4e','\x4d','\x55','\x4c','\x54','\x49','\x50','\x4c','\x45','\x53','\x20','\x2d','\x2d','\x3e','\x0a'
@@ -1583,9 +1583,7 @@ const char implementation_report_xsl[] = {
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x76','\x61','\x72','\x69','\x61','\x62','\x6c','\x65','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x45','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x4e','\x61','\x6d','\x65','\x22','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x76','\x61','\x6c','\x75','\x65','\x2d','\x6f','\x66','\x20','\x73','\x65','\x6c','\x65','\x63','\x74','\x3d','\x22','\x40','\x6e','\x22','\x2f','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x76','\x61','\x72','\x69','\x61','\x62','\x6c','\x65','\x3e','\x0a'
-,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x76','\x61','\x72','\x69','\x61','\x62','\x6c','\x65','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x5f','\x73','\x69','\x7a','\x65','\x22','\x3e','\x0a'
-,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x76','\x61','\x6c','\x75','\x65','\x2d','\x6f','\x66','\x20','\x73','\x65','\x6c','\x65','\x63','\x74','\x3d','\x22','\x6d','\x6d','\x74','\x3a','\x62','\x5b','\x31','\x5d','\x5b','\x40','\x6e','\x3d','\x27','\x48','\x65','\x61','\x64','\x65','\x72','\x27','\x5d','\x2f','\x6d','\x6d','\x74','\x3a','\x64','\x5b','\x40','\x6e','\x3d','\x27','\x53','\x69','\x7a','\x65','\x27','\x5d','\x22','\x2f','\x3e','\x0a'
-,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x76','\x61','\x72','\x69','\x61','\x62','\x6c','\x65','\x3e','\x0a'
+,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x76','\x61','\x72','\x69','\x61','\x62','\x6c','\x65','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x5f','\x73','\x69','\x7a','\x65','\x5f','\x69','\x73','\x5f','\x75','\x6e','\x6c','\x69','\x6d','\x69','\x74','\x65','\x64','\x22','\x20','\x73','\x65','\x6c','\x65','\x63','\x74','\x3d','\x22','\x63','\x6f','\x75','\x6e','\x74','\x28','\x6d','\x6d','\x74','\x3a','\x62','\x5b','\x31','\x5d','\x5b','\x40','\x6e','\x3d','\x27','\x48','\x65','\x61','\x64','\x65','\x72','\x27','\x5d','\x2f','\x6d','\x6d','\x74','\x3a','\x64','\x5b','\x40','\x6e','\x3d','\x27','\x53','\x69','\x7a','\x65','\x27','\x20','\x61','\x6e','\x64','\x20','\x28','\x2e','\x3d','\x27','\x55','\x6e','\x6c','\x69','\x6d','\x69','\x74','\x65','\x64','\x27','\x20','\x6f','\x72','\x20','\x40','\x2a','\x5b','\x73','\x74','\x61','\x72','\x74','\x73','\x2d','\x77','\x69','\x74','\x68','\x28','\x6e','\x61','\x6d','\x65','\x28','\x29','\x2c','\x20','\x27','\x69','\x27','\x29','\x5d','\x3d','\x27','\x55','\x6e','\x6c','\x69','\x6d','\x69','\x74','\x65','\x64','\x27','\x29','\x5d','\x29','\x20','\x26','\x67','\x74','\x3b','\x20','\x30','\x22','\x2f','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x76','\x61','\x72','\x69','\x61','\x62','\x6c','\x65','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x76','\x61','\x6c','\x75','\x65','\x73','\x22','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x66','\x6f','\x72','\x2d','\x65','\x61','\x63','\x68','\x20','\x73','\x65','\x6c','\x65','\x63','\x74','\x3d','\x22','\x70','\x61','\x72','\x65','\x6e','\x74','\x3a','\x3a','\x6d','\x6d','\x74','\x3a','\x62','\x22','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x63','\x61','\x6c','\x6c','\x2d','\x74','\x65','\x6d','\x70','\x6c','\x61','\x74','\x65','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x45','\x42','\x4d','\x4c','\x45','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x56','\x61','\x6c','\x75','\x65','\x22','\x3e','\x0a'
@@ -1594,7 +1592,7 @@ const char implementation_report_xsl[] = {
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x66','\x6f','\x72','\x2d','\x65','\x61','\x63','\x68','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x76','\x61','\x72','\x69','\x61','\x62','\x6c','\x65','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x63','\x68','\x6f','\x6f','\x73','\x65','\x3e','\x0a'
-,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x77','\x68','\x65','\x6e','\x20','\x74','\x65','\x73','\x74','\x3d','\x22','\x24','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x5f','\x73','\x69','\x7a','\x65','\x20','\x21','\x3d','\x20','\x27','\x55','\x6e','\x6c','\x69','\x6d','\x69','\x74','\x65','\x64','\x27','\x22','\x3e','\x0a'
+,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x77','\x68','\x65','\x6e','\x20','\x74','\x65','\x73','\x74','\x3d','\x22','\x6e','\x6f','\x74','\x28','\x24','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x5f','\x73','\x69','\x7a','\x65','\x5f','\x69','\x73','\x5f','\x75','\x6e','\x6c','\x69','\x6d','\x69','\x74','\x65','\x64','\x29','\x22','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x74','\x65','\x73','\x74','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x61','\x74','\x74','\x72','\x69','\x62','\x75','\x74','\x65','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x6f','\x75','\x74','\x63','\x6f','\x6d','\x65','\x22','\x3e','\x70','\x61','\x73','\x73','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x61','\x74','\x74','\x72','\x69','\x62','\x75','\x74','\x65','\x3e','\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x61','\x74','\x74','\x72','\x69','\x62','\x75','\x74','\x65','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x79','\x61','\x22','\x3e','\x0a'
diff --git a/Tools/Implementation/ImplementationReport.xsl b/Tools/Implementation/ImplementationReport.xsl
index 59533cba..1050709c 100644
--- a/Tools/Implementation/ImplementationReport.xsl
+++ b/Tools/Implementation/ImplementationReport.xsl
@@ -143,7 +143,7 @@
                       <xsl:call-template name="size_is_not_unlimited">
                         <xsl:with-param name="icid">EBML-ELEM-UNKNOWN-SIZE</xsl:with-param>
                         <xsl:with-param name="version">1</xsl:with-param>
-                        <xsl:with-param name="element" select="mmt:MicroMediaTrace//mmt:b[not(ancestor::mmt:b[@n='FileData'])][@n!='Segment'][@n!='Cluster'][mmt:b[1][@n='Header']/mmt:d[@n='Name']][mmt:b[1][@n='Header']/mmt:d[@n='Size']='Unlimited']"/>
+                        <xsl:with-param name="element" select="mmt:MicroMediaTrace//mmt:b[not(ancestor::mmt:b[@n='FileData'])][@n!='Segment'][@n!='Cluster'][mmt:b[1][@n='Header']/mmt:d[@n='Name']][mmt:b[1][@n='Header']/mmt:d[@n='Size' and (.='Unlimited' or @*[starts-with(name(), 'i')]='Unlimited')]]"/>
                       </xsl:call-template>
                       <!-- /EBML-ELEM-UNKNOWN-SIZE -->
                       <!-- EBML-ELEMENT-NONMULTIPLES -->
@@ -1571,9 +1571,7 @@
           <xsl:variable name="ElementName">
             <xsl:value-of select="@n"/>
           </xsl:variable>
-          <xsl:variable name="element_size">
-            <xsl:value-of select="mmt:b[1][@n='Header']/mmt:d[@n='Size']"/>
-          </xsl:variable>
+          <xsl:variable name="element_size_is_unlimited" select="count(mmt:b[1][@n='Header']/mmt:d[@n='Size' and (.='Unlimited' or @*[starts-with(name(), 'i')]='Unlimited')]) &gt; 0"/>
           <xsl:variable name="values">
             <xsl:for-each select="parent::mmt:b">
               <xsl:call-template name="EBMLElementValue">
@@ -1582,7 +1580,7 @@
             </xsl:for-each>
           </xsl:variable>
           <xsl:choose>
-            <xsl:when test="$element_size != 'Unlimited'">
+            <xsl:when test="not($element_size_is_unlimited)">
               <test>
                 <xsl:attribute name="outcome">pass</xsl:attribute>
                 <xsl:attribute name="ya">