Fix typo
Merge remote-tracking branch 'upstream/edge' into update/remove-onconfigreload-event