OP-1309 present for Laurent: 3 more Stabilized modes (and a bit of cleanup)