Fix: toggle server crash
Merge remote-tracking branch 'origin/BT' into BT