WS244 development patches