Merging in v1.60-zero-local-access to v1.60