Merging trenster changes + ws support on the proxy