Merge "Fix issue #9611000: Random run-time restarts"