Github-Pull: #15652 Rebased-From: 2ebf650b2eb7a078ab60c8c4d5c726823686f549
mentioned in commit 32ec9008