Merge 'create-public-wiki'