Update: Decouple Agilitybase’s Bootstrap changes from core