btw: do we have an upstream ticket for this feature?