Merge branch 'mh/attr-macro-doc'