Applies WM-4785 for 6.5.X