Applied patch for EDGE-3651

Fix for EDGE-3651