Undo disabling of the reconfiguration checker, pending further study
Merge remote-tracking branch 'upstream/master' into upstream