merge from tongzh
add feature differ to attribute and property