[US205] Missing merge patchs from official version to report version/vendor correctly.