Keep short titles with latest official snapshot
Merge branch 'master' into merge_with_official