370.03 Third checkpoint for SR persistence bug