Merge Request

Fix for Issue WM-4825