Merged in v1.64 changes