Merge "Work on issue #10771346: runtime restart" into klp-dev