[US205] Merge patch from official version to report version/vendor correctly.