Merge branch 'sp/doc-info-attributes'