merge1 of v1.63 into v1.64 a0a29,0db9