Merged v1.65 7a74 into v1.66