Merge "Stopgap fix for stack exhaustion during boot." into main