Note: we are adding a new public call here but I think it should be ok for this backport as we're not breaking any API.