am 2b3a8e52: (-s ours) am 7c9dee4e: Fix ISE in History page (DO NOT MERGE)

* commit '2b3a8e52b7fe27ad4e7b91ed20248b80834c2da2':
  Fix ISE in History page (DO NOT MERGE)