Update main to use the latest canary branch
#1989
Merged
main to use the latest canary branch
#1989