Merge "Removing high-level events mismatch diagnostics." into main