am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues

* commit '7e2f9cc81da788006790365ff11f06551fc1bc26':
  DO NOT MERGE: Fix Matroska issues