am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev

* commit '5a9cfe3ea7fdcec78094530032217fca477561b1':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop