Merge "Fix mismatch check output" into experimental