Merge "fix WM instance leaks" into main