Fixes #23271