this is targeted for 2.2.x, so we should not wait, but a ticket is good