merge v1.63 into v1.64 b763,8a61,11f9,9fc6