WM-4738 for 6.5.X