Closing this one, it looks it requires the backport of #1089 in order to be coherent.
—You are receiving this because you are subscribed to this thread.Reply to this email directly, view it on GitHub, or mute the thread.