Some hack to get  History save working.
Some hack to get  History save working.
Merge origin/master