Merge pull request #123 from dadbodgeoff/fix/main-green-full-scope-canary