Merge branch 'release/v2.5.3' into develop
add line
add gitattributes file
remove line
add comment
fix aggregation result bug
update version v2.5.4
Merge branch 'release/v2.5.4'