Merged in v1.64, for reference only. Do not merge to prod.