Merge branch 'ws-memory-leak-fix' into HEAD