Merge commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f' * commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f': Fix the runtime restart due to name change.
Merge commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f' * commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f': Fix the runtime restart due to name change.