am 1a6030e7: Merge "Remove inconsistency between HistoryItem writing/reading"

* commit '1a6030e76fa5fa0c0a19aeb7d7a53070b9438ea6':
  Remove inconsistency between HistoryItem writing/reading