Merge "Find major version from stream, avoid mismatches"