Support data-type attr
Merge remote-tracking branch 'type-attr/type-attr'