update hg 3342 and 15870;