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

* commit '222920c46044d4782df3cd5b3c6c7e6578659903':
  Maybe fix issue #10797796: IllegalStateException in ProcessState...