demo: history buildng speed up
Merge remote-tracking branch 'origin/dev' into dev