Merge change 4808 into donut

* changes:
  Fixes #1928566. Prevents runtime restart upon configuration change.