CLSN-1485 settlement code review
Save BmatrixValues rather than BMatrix