Correct startup procedure in presence of persistent context.
Correct startup procedure in presence of persistent context.

ajostergaard/ControlPlane,ajostergaard/ControlPlane,ajostergaard/ControlPlane,ajostergaard/ControlPlane