Merge "Work on issue #28689719: Runtime restart" into nyc-dev