Merge "Refactor reconfiguration into a management event"