Merge branch 'ah/doc-attributes-text'