Github-Pull: #15644 Rebased-From: 9453018fdc8f02d42832374bcf1d6e3a1df02281
mentioned in commit 32ec9008