Changes
New Api for History data count2
New Api for History data count2
Revise code for history data
Merge from zhuhai and master