Fix critical rename field error
Merge branch 'canary'