Merged in recent changes to v1.64 into v1.65