Merged in v1.64-use-pks