Merge branch 'po/attributes-text'