merge upstream_hsmul