Merge branch 'mh/test-local-canary'