Item12952: refinements to handling of bootstrap mode
Item12952: impporved handling of bootstrap process