v2.1.0 calling this stable, with tests