merge 31480 31481