Github-Pull: #15644 Rebased-From: 6e051f3d323af1d209c02e7a4319834f1947ffa7
mentioned in commit 32ec9008