CR-1 fixes branched at 0.313.