Re: [PATCH 2/2] Make Initial Setup startup more robust