2.3.0 titration

@pbjd, do you mind if I merge this?