c2e6ca501e
Close #48031, fixes #48016. I didn't use the PR commit because I think it's better to fetch the patch.
Close #48031, fixes #48016. I didn't use the PR commit because I think it's better to fetch the patch.