first-cut changes to support partition plan override.