[PATCH 2/3] Add flag indicating if running in the Initial Setup