am 12b22479: am 222920c4: Merge "Maybe fix issue #10797796: IllegalStateException in ProcessState..." into klp-dev

* commit '12b224799626a506ff3cb3c01cdfdc5b66bce5e3':
  Maybe fix issue #10797796: IllegalStateException in ProcessState...