[kelvin, neil] X restore distribution new plan functionality