merge 38363 38372

thanks