Histories API: apply None rule from 5c5e543 to history update
merge