as a follow up to #18551, some adaptation is needed
I don't know the exact scope, but I wanted to open a ticket for it because the comment in our metadata is too vague and hard to find.
@mhvk feel free to edit this message and add more details.