Merge "Fix branch deletion after failed reconfig"