History data
Merge from kang