There is already a PR for this. It was supposed to be pushed as part of HHH-12592 Closed , but that issue was resolved without my knowledge. I also need this for backporting.