As part of #17242
As part of #17242