Merging v1.66 *applicable* changes to v1.65.