fix publication
Merge branch 'master' into feature/basic-theme