Merge branch 'cs/de'