3.2.x support is a matter for a different branch