v2.0.x: minor refactor