Merge #10155: build: Deduplicate version numbers