Provide keywords
Merge branch 'canary'