Merge "Fix more of issue #28689719: Runtime restart" into nyc-dev