Patch for Stage 3.1.0