OP-1309 present for Laurent: 3 more Stabilized modes (and a bit of cleanup)
Merge branch 'corvuscorax/OP-1309_Stabilization-Refactoring' into corvuscorax/OP-1259_Cruise_Control_Tweaks