Merge branch 'next' into polish-translation