merge 41738 41729