Merge "Log.wtf in mismatch + tests"