Merge "Fix: WhiteBox server leak"