[initial-setup][master][PATCH 0/2] More robust Initial Setup startup