Merge branch 'polish-translation' into next