Merged changes from v1.64.