Applied patch for EDGE-3651