Fix configuration reloading Upstream-commit: 20a038eca68e4188e1cd812293aea8cb220cf08f Component: engine