new plan
Merge remote-tracking branch 'reb/dual-reconfig' into dual-reconfig