Merge branch 'po/everyday-doc'