Merged v1.63 into v1.64