Merge branch 'tc/format-attribute'