Merged v1.63 changes into v1.64