Merged v1.64 into v1.65, ready for next phase