[core] Ensure auto-transitioning environments always end

[core] Ensure auto-transitioning environments always end #1601