See #19788. (cherry picked from commit 6be1feb1) (cherry picked from commit b4ad8b41)
mentioned in commit 7fd086cc