Merged v1.64 changes into v1.65