merge 37662 37688