Merge "Maybe fix issue #10748810: Runtime restart: crash under..." into klp-dev